Browse Source

修改项目结构

戴艳蓉 3 years ago
parent
commit
2b75c2f193
100 changed files with 433 additions and 2319 deletions
  1. 0 2
      scripts/page/indexPage.js
  2. 0 300
      src/components/Dropzone/index.vue
  3. 0 0
      src/components/area-select/index.js
  4. 0 0
      src/components/area-select/main.vue
  5. 0 346
      src/components/changeDialog/capital.vue
  6. 0 342
      src/components/changeDialog/invoice.vue
  7. 0 533
      src/components/changeDialog/order.vue
  8. 0 227
      src/components/changeDialog/refund.vue
  9. 0 0
      src/components/company-search/index.js
  10. 0 0
      src/components/company-search/main.vue
  11. 0 0
      src/components/editor-shy/index.js
  12. 0 0
      src/components/editor-shy/main.vue
  13. 0 0
      src/components/ex-table/ExTableNew.vue
  14. 0 0
      src/components/ex-table/index.js
  15. 0 0
      src/components/ex-table/main.vue
  16. 0 66
      src/components/excelUpload/index.vue
  17. 0 0
      src/components/github-corner/index.js
  18. 7 3
      src/components/github-corner/main.vue
  19. 0 0
      src/components/hamburger/index.js
  20. 0 0
      src/components/hamburger/main.vue
  21. 0 0
      src/components/icon-list/elIcon.js
  22. 2 0
      src/components/icon-list/index.js
  23. 0 0
      src/components/icon-list/main.vue
  24. 0 0
      src/components/index.js
  25. 2 0
      src/components/main-menu/index.js
  26. 0 0
      src/components/main-menu/main.vue
  27. 2 0
      src/components/no-auth/index.js
  28. 0 0
      src/components/no-auth/main.vue
  29. 2 0
      src/components/number-range/index.js
  30. 0 0
      src/components/number-range/main.vue
  31. 2 0
      src/components/organize-tree/index.js
  32. 0 0
      src/components/organize-tree/main.vue
  33. 2 0
      src/components/pan-thumb/index.js
  34. 0 0
      src/components/pan-thumb/main.vue
  35. 2 0
      src/components/period-date-picker/index.js
  36. 0 0
      src/components/period-date-picker/main.vue
  37. 2 0
      src/components/right-panel/index.js
  38. 0 0
      src/components/right-panel/main.vue
  39. 2 0
      src/components/screenfull/index.js
  40. 0 0
      src/components/screenfull/main.vue
  41. 2 0
      src/components/search-select/index.js
  42. 0 0
      src/components/search-select/main.vue
  43. 2 0
      src/components/send-verification-code/index.js
  44. 0 0
      src/components/send-verification-code/main.vue
  45. 2 0
      src/components/shy-select/index.js
  46. 0 0
      src/components/shy-select/main.vue
  47. 2 0
      src/components/shy-tree/index.js
  48. 0 0
      src/components/shy-tree/main.vue
  49. 2 0
      src/components/size-select/index.js
  50. 0 0
      src/components/size-select/main.vue
  51. 2 0
      src/components/staff-tree/index.js
  52. 0 0
      src/components/staff-tree/main.vue
  53. 2 0
      src/components/sticky/index.js
  54. 0 0
      src/components/sticky/main.vue
  55. 2 0
      src/components/stock-search/index.js
  56. 0 0
      src/components/stock-search/main.vue
  57. 2 0
      src/components/theme-picker/index.js
  58. 0 0
      src/components/theme-picker/main.vue
  59. 2 0
      src/components/tree-table/index.js
  60. 0 0
      src/components/tree-table/main.vue
  61. 2 0
      src/components/upload-excel/index.js
  62. 0 0
      src/components/upload-excel/main.vue
  63. 2 0
      src/components/upload/index.js
  64. 0 0
      src/components/upload/main.vue
  65. 0 10
      src/layout/components/Navbar.vue
  66. 0 2
      src/layout/components/Settings/index.vue
  67. 0 2
      src/layout/index.vue
  68. 2 6
      src/main.js
  69. 0 3
      src/views/dashboard/index.vue
  70. 0 2
      src/views/interest/account/index.vue
  71. 0 2
      src/views/interest/dataShare/index.vue
  72. 0 2
      src/views/interest/group/index.vue
  73. 0 2
      src/views/interest/handover/index.vue
  74. 0 2
      src/views/interest/organize/index copy.vue
  75. 0 2
      src/views/interest/role/index.vue
  76. 2 2
      src/views/login/forget-password.vue
  77. 0 2
      src/views/parameter/finance/index.vue
  78. 2 2
      src/views/person-infor/change-phone.vue
  79. 0 2
      src/views/process/done/index.vue
  80. 0 2
      src/views/process/oing/index.vue
  81. 0 6
      src/views/purchaseIn/addStore/index.vue
  82. 0 2
      src/views/purchaseIn/storeGoods/index.vue
  83. 0 4
      src/views/purchaseIn/storeSet/index.vue
  84. 0 4
      src/views/report/addEdit.vue
  85. 0 2
      src/views/report/index.vue
  86. 0 6
      src/views/search/commission/index.vue
  87. 0 4
      src/views/search/standBook/index.vue
  88. 0 4
      src/views/stock/allot/index.vue
  89. 0 4
      src/views/stock/allotFlow/addEdit.vue
  90. 0 4
      src/views/stock/allotFlow/components/addEdit-newApply.vue
  91. 0 2
      src/views/stock/allotFlow/components/checkStock.vue
  92. 0 2
      src/views/stock/allotFlow/components/goStock-audit.vue
  93. 0 2
      src/views/stock/allotFlow/components/inStock-audit.vue
  94. 0 2
      src/views/stock/allotFlow/components/inStock-check.vue
  95. 0 2
      src/views/stock/allotFlow/components/newApply.vue
  96. 0 6
      src/views/stock/allotFlow/index.vue
  97. 0 2
      src/views/stock/check/index.vue
  98. 0 2
      src/views/stock/dataWeido/index.vue
  99. 378 393
      src/views/stock/my-test/index.vue
  100. 0 2
      src/views/stock/productWeido/index.vue

+ 0 - 2
scripts/page/indexPage.js

@@ -208,7 +208,6 @@ module.exports = function (inputName, compoenntName) {
    <script>
     import mixinPage from "@/mixins/elPaginationHandle";
     import resToken from "@/mixins/resToken";
-    import ExTable from "@/components/ExTableNew.vue";
     import statusList from "@/assets/js/statusList";
     import asyncRequest from "@/apis/service/${inputName}";
     import addEdit from "./addEdit";
@@ -219,7 +218,6 @@ module.exports = function (inputName, compoenntName) {
     mixins: [mixinPage, resToken],
     components: {
       addEdit,
-      ExTable,
     },
     computed: {
       ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 300
src/components/Dropzone/index.vue

@@ -1,300 +0,0 @@
-<template>
-  <div :id="id" :ref="id" :action="url" class="dropzone">
-    <input type="file" name="file">
-  </div>
-</template>
-
-<script>
-import Dropzone from 'dropzone'
-import 'dropzone/dist/dropzone.css'
-// import { getToken } from 'admin/qiniu';
-
-
-Dropzone.autoDiscover = false
-
-export default {
-  props: {
-    id: {
-      type: String,
-      required: true
-    },
-    url: {
-      type: String,
-      required: true
-    },
-    clickable: {
-      type: Boolean,
-      default: true
-    },
-    defaultMsg: {
-      type: String,
-      default: '上传图片'
-    },
-    acceptedFiles: {
-      type: String,
-      default: ''
-    },
-    thumbnailHeight: {
-      type: Number,
-      default: 200
-    },
-    thumbnailWidth: {
-      type: Number,
-      default: 200
-    },
-    showRemoveLink: {
-      type: Boolean,
-      default: true
-    },
-    maxFilesize: {
-      type: Number,
-      default: 1
-    },
-    maxFiles: {
-      type: Number,
-      default: 100
-    },
-    autoProcessQueue: {
-      type: Boolean,
-      default: true
-    },
-    useCustomDropzoneOptions: {
-      type: Boolean,
-      default: false
-    },
-    defaultImg: {
-      default: '',
-      type: [String, Array]
-    },
-    couldPaste: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      dropzone: '',
-      initOnce: true
-    }
-  },
-  watch: {
-    defaultImg(val) {
-      if (val.length === 0) {
-        this.initOnce = false
-        return
-      }
-      if (!this.initOnce) return
-      this.initImages(val)
-      this.initOnce = false
-    }
-  },
-  mounted() {
-    const element = document.getElementById(this.id)
-    const vm = this
-    this.dropzone = new Dropzone(element, {
-      clickable: this.clickable,
-      thumbnailWidth: this.thumbnailWidth,
-      thumbnailHeight: this.thumbnailHeight,
-      maxFiles: this.maxFiles,
-      maxFilesize: this.maxFilesize,
-      dictRemoveFile: '移除',
-      addRemoveLinks: this.showRemoveLink,
-      acceptedFiles: this.acceptedFiles,
-      autoProcessQueue: this.autoProcessQueue,
-      dictDefaultMessage: '<i style="margin:0 0 1em 0;display: inline-block" class="material-icons el-icon-upload">' + this.defaultMsg + '</i><br>将文件放到此处上载',
-      dictMaxFilesExceeded: '最多上传100张',
-      previewTemplate: '<div class="dz-preview dz-file-preview">  <div class="dz-image" style="width:' + this.thumbnailWidth + 'px;height:' + this.thumbnailHeight + 'px" ><img style="width:' + this.thumbnailWidth + 'px;height:' + this.thumbnailHeight + 'px" data-dz-thumbnail /></div>  <div class="dz-details"><div class="dz-size"><span data-dz-size></span></div> <div class="dz-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>  <div class="dz-error-message"><span data-dz-errormessage></span></div>  <div class="dz-success-mark"> <i class="material-icons">done</i> </div>  <div class="dz-error-mark"><i class="material-icons">error</i></div></div>',
-      init() {
-        const val = vm.defaultImg
-        if (!val) return
-        if (Array.isArray(val)) {
-          if (val.length === 0) return
-          val.map((v, i) => {
-            const mockFile = { name: 'name' + i, size: 12345, url: v }
-            this.options.addedfile.call(this, mockFile)
-            this.options.thumbnail.call(this, mockFile, v)
-            mockFile.previewElement.classList.add('dz-success')
-            mockFile.previewElement.classList.add('dz-complete')
-            vm.initOnce = false
-            return true
-          })
-        } else {
-          const mockFile = { name: 'name', size: 12345, url: val }
-          this.options.addedfile.call(this, mockFile)
-          this.options.thumbnail.call(this, mockFile, val)
-          mockFile.previewElement.classList.add('dz-success')
-          mockFile.previewElement.classList.add('dz-complete')
-          vm.initOnce = false
-        }
-      },
-      accept: (file, done) => {
-        /* 七牛*/
-        // const token = this.$store.getters.token;
-        // getToken(token).then(response => {
-        //   file.token = response.data.qiniu_token;
-        //   file.key = response.data.qiniu_key;
-        //   file.url = response.data.qiniu_url;
-        //   done();
-        // })
-        done()
-      },
-      sending: (file, xhr, formData) => {
-        // formData.append('token', file.token);
-        // formData.append('key', file.key);
-        vm.initOnce = false
-      }
-    })
-
-    if (this.couldPaste) {
-      document.addEventListener('paste', this.pasteImg)
-    }
-
-    this.dropzone.on('success', file => {
-      vm.$emit('dropzone-success', file, vm.dropzone.element)
-    })
-    this.dropzone.on('addedfile', file => {
-      vm.$emit('dropzone-fileAdded', file)
-    })
-    this.dropzone.on('removedfile', file => {
-      vm.$emit('dropzone-removedFile', file)
-    })
-    this.dropzone.on('error', (file, error, xhr) => {
-      vm.$emit('dropzone-error', file, error, xhr)
-    })
-    this.dropzone.on('successmultiple', (file, error, xhr) => {
-      vm.$emit('dropzone-successmultiple', file, error, xhr)
-    })
-  },
-  destroyed() {
-    document.removeEventListener('paste', this.pasteImg)
-    this.dropzone.destroy()
-  },
-  methods: {
-    removeAllFiles() {
-      this.dropzone.removeAllFiles(true)
-    },
-    processQueue() {
-      this.dropzone.processQueue()
-    },
-    pasteImg(event) {
-      const items = (event.clipboardData || event.originalEvent.clipboardData).items
-      if (items[0].kind === 'file') {
-        this.dropzone.addFile(items[0].getAsFile())
-      }
-    },
-    initImages(val) {
-      if (!val) return
-      if (Array.isArray(val)) {
-        val.map((v, i) => {
-          const mockFile = { name: 'name' + i, size: 12345, url: v }
-          this.dropzone.options.addedfile.call(this.dropzone, mockFile)
-          this.dropzone.options.thumbnail.call(this.dropzone, mockFile, v)
-          mockFile.previewElement.classList.add('dz-success')
-          mockFile.previewElement.classList.add('dz-complete')
-          return true
-        })
-      } else {
-        const mockFile = { name: 'name', size: 12345, url: val }
-        this.dropzone.options.addedfile.call(this.dropzone, mockFile)
-        this.dropzone.options.thumbnail.call(this.dropzone, mockFile, val)
-        mockFile.previewElement.classList.add('dz-success')
-        mockFile.previewElement.classList.add('dz-complete')
-      }
-    }
-
-  }
-}
-</script>
-
-<style scoped>
-    .dropzone {
-        border: 2px solid #E5E5E5;
-        font-family: 'Roboto', sans-serif;
-        color: #777;
-        transition: background-color .2s linear;
-        padding: 5px;
-        min-height: 300px;
-    }
-
-    .dropzone:hover {
-        background-color: #F6F6F6;
-    }
-
-    i {
-        color: #CCC;
-    }
-
-    .dropzone .dz-image img {
-        width: 100%;
-        height: 100%;
-    }
-
-    .dropzone input[name='file'] {
-        display: none;
-    }
-
-    .dropzone .dz-preview .dz-image {
-        border-radius: 0px;
-    }
-
-    .dropzone .dz-preview:hover .dz-image img {
-        transform: none;
-        filter: none;
-        width: 100%;
-        height: 100%;
-    }
-
-    .dropzone .dz-preview .dz-details {
-        bottom: 0px;
-        top: 0px;
-        color: white;
-        background-color: rgba(33, 150, 243, 0.8);
-        transition: opacity .2s linear;
-        text-align: left;
-    }
-
-    .dropzone .dz-preview .dz-details .dz-filename span, .dropzone .dz-preview .dz-details .dz-size span {
-        background-color: transparent;
-    }
-
-    .dropzone .dz-preview .dz-details .dz-filename:not(:hover) span {
-        border: none;
-    }
-
-    .dropzone .dz-preview .dz-details .dz-filename:hover span {
-        background-color: transparent;
-        border: none;
-    }
-
-    .dropzone .dz-preview .dz-remove {
-        position: absolute;
-        z-index: 30;
-        color: white;
-        margin-left: 15px;
-        padding: 10px;
-        top: inherit;
-        bottom: 15px;
-        border: 2px white solid;
-        text-decoration: none;
-        text-transform: uppercase;
-        background: transparent;
-        font-size: 0.8rem;
-        font-weight: 800;
-        letter-spacing: 1.1px;
-        opacity: 0;
-    }
-
-    .dropzone .dz-preview:hover .dz-remove {
-        opacity: 1;
-    }
-
-    .dropzone .dz-preview .dz-success-mark, .dropzone .dz-preview .dz-error-mark {
-        margin-left: -40px;
-        margin-top: -50px;
-    }
-
-    .dropzone .dz-preview .dz-success-mark i, .dropzone .dz-preview .dz-error-mark i {
-        color: white;
-        font-size: 5rem;
-    }
-</style>

+ 0 - 0
src/components/global/editor-shy/index.js → src/components/area-select/index.js


+ 0 - 0
src/components/AreaSelect.vue → src/components/area-select/main.vue


+ 0 - 346
src/components/changeDialog/capital.vue

@@ -1,346 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    title="选择资金"
-    :center="true"
-    align="left"
-    top="7vh"
-    width="1024px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    append-to-body
-    @close="closeModel"
-  >
-    <el-card style="height: 700px; margin-top: -25px">
-      <el-row :gutter="10">
-        <el-col :span="24" style="padding: 0 0 10px 0">
-          <el-col :span="8" style="width: 290px">
-            <el-input v-model="parmValue.traNo" placeholder="请输入资金编号">
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="searchList"
-              ></el-button>
-            </el-input>
-          </el-col>
-          <el-col :span="4" style="width: 160px" class="fr tr">
-            <el-button type="primary" @click="searchList"> 刷新 </el-button>
-            <el-button type="warning" @click="restSearch"> 重置 </el-button>
-          </el-col>
-        </el-col>
-        <el-col :span="24">
-          <el-table
-            :data="tableData"
-            ref="multipleTable"
-            stripe
-            border
-            :size="'mini'"
-            max-height="610"
-            style="width: 100%"
-            row-key="id"
-            :expand-row-keys="expands"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="45"
-               fixed="left"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="traNo"
-              label="资金编号"
-              show-overflow-tooltip
-              width="270"
-            ></el-table-column>
-               <el-table-column
-              prop="companyNo"
-              label="认领企业编号"
-              show-overflow-tooltip
-              width="130"
-            ></el-table-column>
-            <el-table-column
-              prop="customer"
-              label="认领企业名称"
-              show-overflow-tooltip
-              min-width="170"
-            ></el-table-column>
-            <el-table-column
-              prop="trade_out"
-              label="付款方"
-              show-overflow-tooltip
-              min-width="170"
-            ></el-table-column>
-            <el-table-column
-              prop="trade_used"
-              label="付款备注"
-              show-overflow-tooltip
-              width="270"
-            ></el-table-column>
-
-            <el-table-column
-              prop="total_fee"
-              label="资金总额度"
-              show-overflow-tooltip
-              min-width="110"
-            ></el-table-column>
-
-            <el-table-column
-              label="关联发票信息"
-              show-overflow-tooltip
-              align="center"
-            >
-              <el-table-column
-                prop="inv_fee"
-                label="已核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="inv_used"
-                label="处理中的金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="winv_fee"
-                label="未核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    type="danger"
-                    :size="'mini'"
-                    v-if="scope.row.inv_status === '1'"
-                    >未核销</el-tag
-                  >
-                  <el-tag
-                    type="warning"
-                    :size="'mini'"
-                    v-else-if="scope.row.inv_status === '2'"
-                    >部分核销</el-tag
-                  >
-                  <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                </template>
-              </el-table-column>
-            </el-table-column>
-            <el-table-column
-              label="关联确认单信息"
-              show-overflow-tooltip
-              align="center"
-            >
-              <el-table-column
-                prop="order_fee"
-                label="已核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="order_used"
-                label="处理中的金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="worder_fee"
-                label="未核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    type="danger"
-                    :size="'mini'"
-                    v-if="scope.row.order_status === '1'"
-                    >未核销</el-tag
-                  >
-                  <el-tag
-                    type="warning"
-                    :size="'mini'"
-                    v-else-if="scope.row.order_status === '2'"
-                    >部分核销</el-tag
-                  >
-                  <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                </template>
-              </el-table-column>
-            </el-table-column>
-            <el-table-column
-              prop="addtime"
-              label="创建时间"
-              show-overflow-tooltip
-              width="150"
-            ></el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="18">
-              <div
-                class="Pagination"
-                style="text-align: center; margin-top: 12px"
-              >
-                <el-pagination
-                  :current-page="parmValue.page"
-                  :page-size="parmValue.size"
-                  :size="searchSize"
-                  layout="total,  prev, pager, next, jumper"
-                  :total="count"
-                  @size-change="handleSizeChange"
-                  @current-change="handlePageChange"
-                />
-              </div>
-            </el-col>
-            <el-col :span="6" style="text-align: right">
-              <div style="margin-top: 12px">
-                <el-button type="primary" size="medium" @click="submitForm"
-                  >保 存
-                </el-button>
-                <el-button @click="showModelThis = false" size="medium">{{
-                  isDetail ? "关 闭" : "取 消"
-                }}</el-button>
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-
-<script>
-import asyncRequest from "@/apis/service/InvoiceSales/capitalPool";
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-export default {
-  props: [
-    "id",
-    "showModel",
-    "trade_status",
-    "order_status",
-    "inv_status",
-    "type_check",
-    "onces",
-    "status",
-  ],
-  mixins: [mixinPage, resToken],
-  data() {
-    return {
-      loading: false,
-      icon: "",
-      count: 0,
-      tableData: [],
-      showModelThis: this.showModel,
-      multipleSelection: [],
-      parmValue: {
-        companyNo: "",
-        total_low: "", //
-        total_up: "", //
-        inv_status: "", //
-        order_status: "", //
-        traNo: "", //
-        status: "", //
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      },
-    };
-  },
-  watch: {
-    icon(val) {
-      if (val) {
-        this.showModelThis = false;
-        this.$emit("setVal", val);
-      }
-    },
-    showModel: function (val) {
-      this.showModelThis = val;
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      } else {
-        this.searchList();
-      }
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    restSearch() {
-      this.parmValue.traNo = "";
-      this.parmValue.page = 1;
-      this.searchList();
-    },
-    async searchList() {
-      this.multipleSelection = [];
-      if (!this.loading) {
-        this.loading = true;
-        this.tableData = [];
-        this.parmValue.companyNo = this.id; // 客户企业编码
-        this.parmValue.type_check = this.type_check;
-        this.parmValue.order_status = this.order_status;
-        this.parmValue.inv_status = this.inv_status;
-        this.parmValue.status = this.status ? this.status : "";
-        const res = await asyncRequest.list(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.tableData = [];
-          this.count = 0;
-        }
-        this.loading = false;
-      }
-    },
-    closeModel() {
-      console.log("closeModel!!");
-    },
-    async submitForm() {
-      let isok = true;
-      this.multipleSelection.forEach((v1) => {
-        if (this.inv_status === "4" && parseInt(v1.inv_used) !== 0) {
-          isok = false;
-        }
-        if (this.order_status === "4" && parseInt(v1.order_used) !== 0) {
-          isok = false;
-        }
-      });
-      if (!isok) {
-        if (this.inv_status === "4") {
-          this.$message.warning("部分资金信息:发票处理中的金额不为零!!");
-          return;
-        }
-        if (this.order_status === "4") {
-          this.$message.warning("部分资金信息:确认单处理中的金额不为零!!");
-          return;
-        }
-      }
-      if (this.onces && this.multipleSelection.length > 1) {
-        this.$message.warning("只能选择一条数据!");
-      } else {
-        // 刷新
-        this.showModelThis = false;
-        this.$emit("refresh", this.multipleSelection);
-      }
-    },
-  },
-};
-</script>
-
-<style></style>

+ 0 - 342
src/components/changeDialog/invoice.vue

@@ -1,342 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    title="选择发票"
-    :center="true"
-    align="left"
-    top="7vh"
-    width="1024px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    append-to-body
-    @close="closeModel"
-  >
-    <el-card style="height: 700px; margin-top: -25px">
-      <el-row :gutter="10">
-        <el-col :span="24" style="padding: 0 0 10px 0">
-          <el-col :span="8" style="width: 290px">
-            <el-input v-model="parmValue.invNo" placeholder="请输入发票编号">
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="searchList"
-              ></el-button>
-            </el-input>
-          </el-col>
-          <el-col :span="4" style="width: 160px" class="fr tr">
-            <el-button type="primary" @click="searchList"> 刷新 </el-button>
-            <el-button type="warning" @click="restSearch"> 重置 </el-button>
-          </el-col>
-        </el-col>
-        <el-col :span="24">
-          <el-table
-            :data="tableData"
-            ref="multipleTable"
-            stripe
-            border
-            :size="'mini'"
-            max-height="610"
-            style="width: 100%"
-            row-key="id"
-            :expand-row-keys="expands"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="45"
-                 fixed="left"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="invNo"
-              label="发票编号"
-              show-overflow-tooltip
-              width="170"
-            ></el-table-column>
-                <el-table-column
-              prop="inv_in"
-              label="企业编码"
-              show-overflow-tooltip
-              min-width="130"
-            ></el-table-column>
-            <el-table-column
-              prop="company"
-              label="企业名称"
-              show-overflow-tooltip
-              min-width="170"
-            ></el-table-column>
-            <el-table-column
-              prop="apply_name"
-              label="处理人"
-              show-overflow-tooltip
-              min-width="70"
-            ></el-table-column>
-
-            <el-table-column
-              prop="inv_value"
-              label="发票额度"
-              show-overflow-tooltip
-              min-width="110"
-            ></el-table-column>
-
-            <el-table-column
-              label="关联资金信息"
-              show-overflow-tooltip
-              align="center"
-            >
-              <el-table-column
-                prop="atrade_fee"
-                label="已核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="fund_used"
-                label="处理中的金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="wtrade_fee"
-                label="未核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    type="danger"
-                    :size="'mini'"
-                    v-if="scope.row.trade_status === '1'"
-                    >未核销</el-tag
-                  >
-                  <el-tag
-                    type="warning"
-                    :size="'mini'"
-                    v-else-if="scope.row.trade_status === '2'"
-                    >部分核销</el-tag
-                  >
-                  <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                </template>
-              </el-table-column>
-            </el-table-column>
-            <el-table-column
-              label="关联确认单信息"
-              show-overflow-tooltip
-              align="center"
-            >
-              <el-table-column
-                prop="aorder_fee"
-                label="已核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="order_used"
-                label="处理中的金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="worder_fee"
-                label="未核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    type="danger"
-                    :size="'mini'"
-                    v-if="scope.row.order_status === '1'"
-                    >未核销</el-tag
-                  >
-                  <el-tag
-                    type="warning"
-                    :size="'mini'"
-                    v-else-if="scope.row.order_status === '2'"
-                    >部分核销</el-tag
-                  >
-                  <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                </template>
-              </el-table-column>
-            </el-table-column>
-            <el-table-column
-              prop="addtime"
-              label="创建时间"
-              show-overflow-tooltip
-              width="150"
-            ></el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="18">
-              <div
-                class="Pagination"
-                style="text-align: center; margin-top: 12px"
-              >
-                <el-pagination
-                  :current-page="parmValue.page"
-                  :page-size="parmValue.size"
-                  :size="searchSize"
-                  layout="total,  prev, pager, next, jumper"
-                  :total="count"
-                  @size-change="handleSizeChange"
-                  @current-change="handlePageChange"
-                />
-              </div>
-            </el-col>
-            <el-col :span="6" style="text-align: right">
-              <div style="margin-top: 12px">
-                <el-button type="primary" size="medium" @click="submitForm"
-                  >保 存
-                </el-button>
-                <el-button @click="showModelThis = false" size="medium">{{
-                  isDetail ? "关 闭" : "取 消"
-                }}</el-button>
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-
-<script>
-import asyncRequest from "@/apis/service/InvoiceSales/invoicePool";
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-export default {
-  props: [
-    "id",
-    "showModel",
-    "trade_status",
-    "order_status",
-    "inv_status",
-    "type_check",
-    "onces",
-  ],
-  mixins: [mixinPage, resToken],
-  data() {
-    return {
-      loading: false,
-      icon: "",
-      count: 0,
-      tableData: [],
-      showModelThis: this.showModel,
-      multipleSelection: [],
-      parmValue: {
-        companyNo: "",
-        order_status: "",
-        trade_status: "",
-        total_low: "",
-        total_up: "",
-        starttime: "",
-        endtime: "",
-        type_check: "",
-        status: "",
-        invNo: "",
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      },
-    };
-  },
-  watch: {
-    icon(val) {
-      if (val) {
-        this.showModelThis = false;
-        this.$emit("setVal", val);
-      }
-    },
-    showModel: function (val) {
-      this.showModelThis = val;
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      } else {
-        this.searchList();
-      }
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    restSearch() {
-      this.parmValue.invNo = "";
-      this.parmValue.page = 1;
-      this.searchList();
-    },
-    async searchList() {
-      this.multipleSelection = [];
-      if (!this.loading) {
-        this.loading = true;
-        this.tableData = [];
-        this.parmValue.companyNo = this.id; // 客户企业编码
-        this.parmValue.type_check = this.type_check;
-        this.parmValue.order_status = this.order_status;
-        this.parmValue.trade_status = this.trade_status;
-        const res = await asyncRequest.list(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.tableData = [];
-          this.count = 0;
-        }
-        this.loading = false;
-      }
-    },
-    closeModel() {
-      console.log("closeModel!!");
-    },
-    async submitForm() {
-      let isok = true;
-      this.multipleSelection.forEach((v1) => {
-        if (this.trade_status === "4" && parseInt(v1.fund_used) !== 0) {
-          isok = false;
-        }
-        if (this.order_status === "4" && parseInt(v1.order_used) !== 0) {
-          isok = false;
-        }
-      });
-      if (!isok) {
-        if (this.trade_status === "4") {
-          this.$message.warning("部分发票信息:资金处理中的金额不为零!!");
-          return;
-        }
-        if (this.order_status === "4") {
-          this.$message.warning("部分发票信息:确认单处理中的金额不为零!!");
-          return;
-        }
-      }
-
-      if (this.onces && this.multipleSelection.length > 1) {
-        this.$message.warning("只能选择一条数据!");
-      } else {
-        // 刷新
-        this.showModelThis = false;
-        this.$emit("refresh", this.multipleSelection);
-      }
-    },
-  },
-};
-</script>
-
-<style></style>

+ 0 - 533
src/components/changeDialog/order.vue

@@ -1,533 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    title="选择确认单"
-    :center="true"
-    align="left"
-    top="7vh"
-    width="1024px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    append-to-body
-    @close="closeModel"
-  >
-    <el-card style="height: 700px; margin-top: -25px">
-      <el-row :gutter="10">
-        <el-col :span="24" style="padding: 0 0 10px 0">
-          <el-col :span="8" style="width: 290px">
-            <el-input
-              v-model="parmValue.sequenceNo"
-              placeholder="请输入确认单编号"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="searchList"
-              ></el-button>
-            </el-input>
-          </el-col>
-          <el-col :span="4" style="width: 160px" class="fr tr">
-            <el-button type="primary" @click="searchList"> 刷新 </el-button>
-            <el-button type="warning" @click="restSearch"> 重置 </el-button>
-          </el-col>
-        </el-col>
-        <el-col :span="24">
-          <el-table
-            :data="tableData"
-            ref="multipleTable"
-            stripe
-            border
-            :size="'mini'"
-            max-height="610"
-            style="width: 100%"
-            row-key="id"
-            :expand-row-keys="expands"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column type="expand">
-              <template #default="props">
-                <el-table
-                  style="width: 100%"
-                  :size="'mini'"
-                  :data="props.row.good"
-                  stripe
-                  max-height="350"
-                  border
-                >
-                  <el-table-column
-                    label="产品编号"
-                    prop="goodNo"
-                    show-overflow-tooltip
-                    width="125"
-                  >
-                  </el-table-column>
-                  <el-table-column
-                    label="商品名称"
-                    prop="goodname"
-                    show-overflow-tooltip
-                  >
-                  </el-table-column>
-                  <el-table-column
-                    label="品牌"
-                    prop="brand"
-                    width="80"
-                    show-overflow-tooltip
-                  >
-                  </el-table-column>
-                  <el-table-column
-                    label="单位"
-                    prop="unit"
-                    width="80"
-                    show-overflow-tooltip
-                  >
-                  </el-table-column>
-                  <el-table-column
-                    label="数量"
-                    width="65"
-                    show-overflow-tooltip
-                  >
-                    <template #default="scope">{{ scope.row.num }} </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="单价"
-                    width="90"
-                    show-overflow-tooltip
-                  >
-                    <template #default="scope"
-                      >{{ scope.row.price }}
-                    </template></el-table-column
-                  >
-                  <el-table-column
-                    label="总价"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope"
-                      >{{ scope.row.total_fee }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="资金已核销金额"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope"
-                      >{{ scope.row.apay_fee }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    prop="paying_fee"
-                    label="资金处理中的金额"
-                    show-overflow-tooltip
-                    min-width="120"
-                  ></el-table-column>
-                  <el-table-column
-                    label="资金待核销金额"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope"
-                      >{{ scope.row.wpay_fee }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="关联资金状态"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope">
-                      <el-tag
-                        type="danger"
-                        :size="'mini'"
-                        v-if="scope.row.pay_status === '1'"
-                        >未核销</el-tag
-                      >
-                      <el-tag
-                        type="warning"
-                        :size="'mini'"
-                        v-else-if="scope.row.pay_status === '2'"
-                        >部分核销</el-tag
-                      >
-                      <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="发票已核销数量"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope"
-                      >{{ scope.row.inv_num }}
-                    </template>
-                  </el-table-column>
-
-                  <el-table-column
-                    label="发票已核销金额"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope"
-                      >{{ scope.row.ainv_fee }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    prop="inving_fee"
-                    label="发票处理中的金额"
-                    show-overflow-tooltip
-                    min-width="120"
-                  ></el-table-column>
-                  <el-table-column
-                    label="发票待核销金额"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope"
-                      >{{ scope.row.winv_fee }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="关联发票状态"
-                    width="105"
-                    show-overflow-tooltip
-                    ><template #default="scope">
-                      <el-tag
-                        type="danger"
-                        :size="'mini'"
-                        v-if="scope.row.inv_status === '1'"
-                        >未核销</el-tag
-                      >
-                      <el-tag
-                        type="warning"
-                        :size="'mini'"
-                        v-else-if="scope.row.inv_status === '2'"
-                        >部分核销</el-tag
-                      >
-                      <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </el-table-column>
-            <el-table-column
-              type="selection"
-              width="45"
-                 fixed="left"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="sequenceNo"
-              label="确认单号"
-              show-overflow-tooltip
-              width="140"
-            ></el-table-column>
-            <el-table-column
-              prop="companyNo"
-              label="企业编码"
-              show-overflow-tooltip
-              width="130"
-            ></el-table-column>
-            <el-table-column
-              prop="customer"
-              label="企业名称"
-              show-overflow-tooltip
-              min-width="170"
-            ></el-table-column>
-            <el-table-column
-              prop="contactor"
-              label="联系人"
-              show-overflow-tooltip
-              min-width="70"
-            ></el-table-column>
-            <el-table-column
-              prop="sales_name"
-              label="业务员"
-              show-overflow-tooltip
-              min-width="70"
-            ></el-table-column>
-            <!-- <el-table-column
-              prop="createdTime"
-              label="创建时间"
-              show-overflow-tooltip
-              min-width="145"
-            ></el-table-column> -->
-            <el-table-column
-              prop="total_fee"
-              label="订单总金额"
-              show-overflow-tooltip
-              min-width="110"
-            ></el-table-column>
-
-            <el-table-column
-              label="关联资金信息"
-              show-overflow-tooltip
-              align="center"
-            >
-              <el-table-column
-                prop="apay_fee"
-                label="已核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="pay_fee"
-                label="处理中的金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="wpay_fee"
-                label="未核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    type="danger"
-                    :size="'mini'"
-                    v-if="scope.row.pay_status === '1'"
-                    >未核销</el-tag
-                  >
-                  <el-tag
-                    type="warning"
-                    :size="'mini'"
-                    v-else-if="scope.row.pay_status === '2'"
-                    >部分核销</el-tag
-                  >
-                  <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                </template>
-              </el-table-column>
-            </el-table-column>
-            <el-table-column
-              label="关联发票信息"
-              show-overflow-tooltip
-              align="center"
-            >
-              <el-table-column
-                prop="ainv_fee"
-                label="已核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="inv_fee"
-                label="处理中的金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                prop="winv_fee"
-                label="未核销金额"
-                show-overflow-tooltip
-                min-width="110"
-              ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    type="danger"
-                    :size="'mini'"
-                    v-if="scope.row.inv_status === '1'"
-                    >未核销</el-tag
-                  >
-                  <el-tag
-                    type="warning"
-                    :size="'mini'"
-                    v-else-if="scope.row.inv_status === '2'"
-                    >部分核销</el-tag
-                  >
-                  <el-tag type="" :size="'mini'" v-else>全部核销</el-tag>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="18">
-              <div
-                class="Pagination"
-                style="text-align: center; margin-top: 12px"
-              >
-                <el-pagination
-                  :current-page="parmValue.page"
-                  :page-size="parmValue.size"
-                  :size="searchSize"
-                  layout="total,  prev, pager, next, jumper"
-                  :total="count"
-                  @size-change="handleSizeChange"
-                  @current-change="handlePageChange"
-                />
-              </div>
-            </el-col>
-            <el-col :span="6" style="text-align: right">
-              <div style="margin-top: 12px">
-                <el-button type="primary" size="medium" @click="submitForm"
-                  >保 存
-                </el-button>
-                <el-button @click="showModelThis = false" size="medium">{{
-                  isDetail ? "关 闭" : "取 消"
-                }}</el-button>
-              </div>
-            </el-col>
-          </el-row>
-          <!-- <el-col :span="24" style="text-align: right">
-          <el-button type="primary" @click="submitForm"> 保 存 </el-button>
-          <el-button @click="showModelThis = false">取 消</el-button>
-        </el-col> -->
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-
-<script>
-import asyncRequest from "@/apis/service/InvoiceSales/invoiceApply";
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-export default {
-  props: [
-    "id",
-    "showModel",
-    "inv_status",
-    "trade_status",
-    "order_status",
-    "onces",
-    "isAll",
-  ],
-  mixins: [mixinPage, resToken],
-  data() {
-    return {
-      loading: false,
-      icon: "",
-      count: 0,
-      tableData: [],
-      showModelThis: this.showModel,
-      multipleSelection: [],
-      parmValue: {
-        starttime: "", // 起始时间
-        endtime: "", //结束时间
-        sequenceNo: "", // 订单编号
-        companyNo: this.id, // 客户企业编码
-        page: 1, // 页码
-        size: 10, // 每页显示条数
-        total_low: "", //最小金额
-        total_up: "", //最大金额
-        pay_status: "", //资金核销状态
-        inv_status: "", //发票核销状态
-        inv_low: "", //发票未核销最小金额
-        inv_up: "", //发票未核销最大金额
-        pay_low: "", //资金未核销最小金额
-        pay_up: "", //资金未核销最大金额
-      },
-    };
-  },
-  watch: {
-    icon(val) {
-      if (val) {
-        this.showModelThis = false;
-        this.$emit("setVal", val);
-      }
-    },
-    showModel: function (val) {
-      this.showModelThis = val;
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      } else {
-        this.searchList();
-      }
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    restSearch() {
-      this.parmValue.sequenceNo = "";
-      this.parmValue.page = 1;
-      this.searchList();
-    },
-    async searchList() {
-      this.multipleSelection = [];
-      if (!this.loading) {
-        this.loading = true;
-        this.tableData = [];
-        this.parmValue.companyNo = this.id; // 客户企业编码
-        this.parmValue.pay_status = this.trade_status; //资金核销状态
-        this.parmValue.inv_status = this.inv_status; //发票核销状态
-        const res = await asyncRequest.qrdlist(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.tableData = [];
-          this.count = 0;
-        }
-        this.loading = false;
-      }
-    },
-    closeModel() {
-      console.log("closeModel!!");
-    },
-    async submitForm() {
-      let isok = true;
-      this.multipleSelection.forEach((v1) => {
-        if (this.inv_status === "4" && parseInt(v1.inv_fee) !== 0) {
-          isok = false;
-        }
-        if (this.trade_status === "4" && parseInt(v1.pay_fee) !== 0) {
-          isok = false;
-        }
-      });
-      if (!isok) {
-        if (this.inv_status === "4") {
-          this.$message.warning("部分确认单信息:发票处理中的金额不为零!!");
-          return;
-        }
-        if (this.trade_status === "4") {
-          this.$message.warning("部分确认单信息:资金处理中的金额不为零!!");
-          return;
-        }
-      }
-
-      if (this.onces && this.multipleSelection.length > 1) {
-        this.$message.warning("只能选择一条数据!");
-        return;
-      } else {
-        if (this.isAll === true) {
-          // 刷新
-          this.showModelThis = false;
-          this.$emit("refresh", this.multipleSelection);
-        } else {
-          let arr = [];
-          this.multipleSelection.forEach((v1) => {
-            v1.good.forEach((v2) => {
-              console.log(v2);
-              v2.orderNo = v1.sequenceNo;
-              v2.good_num = parseInt(v2.num) - parseInt(v2.inv_num); //此次核销数量
-              v2.over_num = parseInt(v2.num) - parseInt(v2.inv_num);
-              v2.total = v2.total_fee;
-              v2.total_fee = v2.winv_fee; //此次核销金额
-              v2.over_total = v2.winv_fee;
-              v2.remark = v2.goodname;
-              arr.push(v2);
-            });
-          });
-          // 刷新
-          this.showModelThis = false;
-          this.$emit("refresh", arr);
-        }
-      }
-    },
-  },
-};
-</script>
-
-<style></style>

+ 0 - 227
src/components/changeDialog/refund.vue

@@ -1,227 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    title="选择退款记录"
-    :center="true"
-    align="left"
-    top="7vh"
-    width="1024px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    append-to-body
-    @close="closeModel"
-  >
-    <el-card style="height: 700px; margin-top: -25px">
-      <el-row :gutter="10">
-        <el-col :span="24" style="padding: 0 0 10px 0">
-          <el-col :span="8" style="width: 290px">
-            <el-input v-model="parmValue.traNo" placeholder="请输入退款编号">
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="searchList"
-              ></el-button>
-            </el-input>
-          </el-col>
-          <el-col :span="4" style="width: 160px" class="fr tr">
-            <el-button type="primary" @click="searchList"> 刷新 </el-button>
-            <el-button type="warning" @click="restSearch"> 重置 </el-button>
-          </el-col>
-        </el-col>
-        <el-col :span="24">
-          <el-table
-            :data="tableData"
-            ref="multipleTable"
-            stripe
-            border
-            :size="'mini'"
-            max-height="610"
-            style="width: 100%"
-            row-key="id"
-            :expand-row-keys="expands"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="45"
-              fixed="left"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="refundNo"
-              label="退款编号"
-              show-overflow-tooltip
-              width="180"
-            ></el-table-column>
-
-            <el-table-column
-              prop="traNo"
-              label="原资金编号"
-              show-overflow-tooltip
-              width="230"
-            ></el-table-column>
-
-            <el-table-column
-              prop="customerNo"
-              label="客户企业编码"
-              show-overflow-tooltip
-              width="130"
-            ></el-table-column>
-            <el-table-column
-              prop="customer"
-              label="客户企业名称"
-              show-overflow-tooltip
-              min-width="170"
-            ></el-table-column>
-
-            <el-table-column
-              prop="refund_fee"
-              label="退款总额度"
-              show-overflow-tooltip
-              width="120px"
-            ></el-table-column>
-            <el-table-column
-              prop="back_fee"
-              label="退款认领额度"
-              show-overflow-tooltip
-              width="120"
-            ></el-table-column>
-
-            <el-table-column
-              prop="addtime"
-              label="申请时间"
-              show-overflow-tooltip
-              width="150"
-            ></el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="18">
-              <div
-                class="Pagination"
-                style="text-align: center; margin-top: 12px"
-              >
-                <el-pagination
-                  :current-page="parmValue.page"
-                  :page-size="parmValue.size"
-                  :size="searchSize"
-                  layout="total,  prev, pager, next, jumper"
-                  :total="count"
-                  @size-change="handleSizeChange"
-                  @current-change="handlePageChange"
-                />
-              </div>
-            </el-col>
-            <el-col :span="6" style="text-align: right">
-              <div style="margin-top: 12px">
-                <el-button type="primary" size="medium" @click="submitForm"
-                  >保 存
-                </el-button>
-                <el-button @click="showModelThis = false" size="medium">{{
-                  isDetail ? "关 闭" : "取 消"
-                }}</el-button>
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-
-<script>
-import asyncRequest from "@/apis/service/InvoiceSales/refund";
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-export default {
-  props: ["id", "showModel", "refund_status", "onces"],
-  mixins: [mixinPage, resToken],
-  data() {
-    return {
-      loading: false,
-      icon: "",
-      count: 0,
-      tableData: [],
-      showModelThis: this.showModel,
-      multipleSelection: [],
-      parmValue: {
-        type: "1",
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-        relaNo: "",
-        inv_type: "",
-        back_type: "",
-        refund_status: "",
-      },
-    };
-  },
-  watch: {
-    icon(val) {
-      if (val) {
-        this.showModelThis = false;
-        this.$emit("setVal", val);
-      }
-    },
-    showModel: function (val) {
-      this.showModelThis = val;
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      } else {
-        this.searchList();
-      }
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    restSearch() {
-      this.parmValue.traNo = "";
-      this.parmValue.page = 1;
-      this.searchList();
-    },
-    async searchList() {
-      this.multipleSelection = [];
-      if (!this.loading) {
-        this.loading = true;
-        this.tableData = [];
-        this.parmValue.companyNo = this.id; // 客户企业编码
-        this.parmValue.refund_status = this.refund_status
-          ? this.refund_status
-          : "";
-        const res = await asyncRequest.list(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.tableData = [];
-          this.count = 0;
-        }
-        this.loading = false;
-      }
-    },
-    closeModel() {
-      console.log("closeModel!!");
-    },
-    async submitForm() {
-      if (this.onces && this.multipleSelection.length > 1) {
-        this.$message.warning("只能选择一条数据!");
-      } else {
-        // 刷新
-        this.showModelThis = false;
-        this.$emit("refresh", this.multipleSelection);
-      }
-    },
-  },
-};
-</script>
-
-<style></style>

+ 0 - 0
src/components/global/icon-list/index.js → src/components/company-search/index.js


+ 0 - 0
src/components/companySearch.vue → src/components/company-search/main.vue


+ 0 - 0
src/components/global/organize-tree/index.js → src/components/editor-shy/index.js


+ 0 - 0
src/components/global/editor-shy/main.vue → src/components/editor-shy/main.vue


+ 0 - 0
src/components/ExTableNew.vue → src/components/ex-table/ExTableNew.vue


+ 0 - 0
src/components/global/shy-select/index.js → src/components/ex-table/index.js


+ 0 - 0
src/components/ExTable.vue → src/components/ex-table/main.vue


+ 0 - 66
src/components/excelUpload/index.vue

@@ -1,66 +0,0 @@
-<template>
-  <div class="fileBoxInput">
-    <input
-      ref="fileInputer"
-      :accept="accept"
-      :multiple="false"
-      class="fileUp"
-      type="file"
-      name="file"
-      @change="handleChange($event)"
-    />
-  </div>
-</template>
-
-<script>
-//Uploadcondition 用于判断个性化文件 //返回 false 就不会上传文件
-//UploadErrorEvent 上传成功
-//UploadErrorEvent 上传失败
-
-export default {
-  name: "fileUpload",
-  props: {
-    //@reject 默认值
-    accept: String, //上传文件类型
-    uploadcondition: {
-      type: Function,
-      default: null,
-    },
-  },
-  data() {
-    return {};
-  },
-  methods: {
-    handleChange() {
-      let that = this;
-      let inputDOM1 = this.$refs.fileInputer;
-      const files = inputDOM1.files;
-      if (files.length === 0) return;
-      if (!this.uploadcondition(files[0])) {
-        that.$refs.fileInputer.value = "";
-        return false;
-      }
-      const file = files[0];
-      that.$refs.fileInputer.value = "";
-      that.$emit("UploadSuccessEvent", {
-        file: file,
-      });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.fileBoxInput {
-  display: block;
-  .fileUp {
-    display: block;
-    opacity: 0;
-    width: 100%;
-    height: 100%;
-    outline: none;
-    &:hover{
-      cursor: pointer;
-    }
-  }
-}
-</style>

+ 0 - 0
src/components/global/shy-tree/index.js → src/components/github-corner/index.js


+ 7 - 3
src/components/GithubCorner/index.vue → src/components/github-corner/main.vue

@@ -9,14 +9,14 @@
       width="80"
       height="80"
       viewBox="0 0 250 250"
-      style="fill:#40c9c6; color:#fff;"
+      style="fill: #40c9c6; color: #fff"
       aria-hidden="true"
     >
       <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z" />
       <path
         d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
         fill="currentColor"
-        style="transform-origin: 130px 106px;"
+        style="transform-origin: 130px 106px"
         class="octo-arm"
       />
       <path
@@ -27,7 +27,11 @@
     </svg>
   </a>
 </template>
-
+<script>
+export default {
+  name: "GithubCorner",
+};
+</script>
 <style scoped>
 .github-corner:hover .octo-arm {
   animation: octocat-wave 560ms ease-in-out;

+ 0 - 0
src/components/global/staff-tree/index.js → src/components/hamburger/index.js


+ 0 - 0
src/components/Hamburger/index.vue → src/components/hamburger/main.vue


+ 0 - 0
src/components/global/icon-list/elIcon.js → src/components/icon-list/elIcon.js


+ 2 - 0
src/components/icon-list/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/global/icon-list/main.vue → src/components/icon-list/main.vue


+ 0 - 0
src/components/global/index.js → src/components/index.js


+ 2 - 0
src/components/main-menu/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/mainMenu/index.vue → src/components/main-menu/main.vue


+ 2 - 0
src/components/no-auth/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/NoAuth/index.vue → src/components/no-auth/main.vue


+ 2 - 0
src/components/number-range/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/numberRange.vue → src/components/number-range/main.vue


+ 2 - 0
src/components/organize-tree/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/global/organize-tree/main.vue → src/components/organize-tree/main.vue


+ 2 - 0
src/components/pan-thumb/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/PanThumb/index.vue → src/components/pan-thumb/main.vue


+ 2 - 0
src/components/period-date-picker/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/PeriodDatePicker.vue → src/components/period-date-picker/main.vue


+ 2 - 0
src/components/right-panel/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/RightPanel/index.vue → src/components/right-panel/main.vue


+ 2 - 0
src/components/screenfull/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/Screenfull/index.vue → src/components/screenfull/main.vue


+ 2 - 0
src/components/search-select/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/global/search-select/index.vue → src/components/search-select/main.vue


+ 2 - 0
src/components/send-verification-code/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/SendVerificationCode/index.vue → src/components/send-verification-code/main.vue


+ 2 - 0
src/components/shy-select/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/global/shy-select/main.vue → src/components/shy-select/main.vue


+ 2 - 0
src/components/shy-tree/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/global/shy-tree/main.vue → src/components/shy-tree/main.vue


+ 2 - 0
src/components/size-select/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/SizeSelect/index.vue → src/components/size-select/main.vue


+ 2 - 0
src/components/staff-tree/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/global/staff-tree/main.vue → src/components/staff-tree/main.vue


+ 2 - 0
src/components/sticky/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/Sticky/index.vue → src/components/sticky/main.vue


+ 2 - 0
src/components/stock-search/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/stockSearch.vue → src/components/stock-search/main.vue


+ 2 - 0
src/components/theme-picker/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/ThemePicker/index.vue → src/components/theme-picker/main.vue


+ 2 - 0
src/components/tree-table/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/tree-table/index.vue → src/components/tree-table/main.vue


+ 2 - 0
src/components/upload-excel/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/UploadExcel/index.vue → src/components/upload-excel/main.vue


+ 2 - 0
src/components/upload/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

+ 0 - 0
src/components/Upload/index.vue → src/components/upload/main.vue


+ 0 - 10
src/layout/components/Navbar.vue

@@ -128,22 +128,12 @@
 
 <script>
 import { mapGetters } from "vuex";
-import Hamburger from "@/components/Hamburger";
-import Screenfull from "@/components/Screenfull";
-import mainMenu from "@/components/mainMenu";
 
-import SizeSelect from "@/components/SizeSelect";
 import asyncRequest from "@/apis/service/system/updates";
 import resToken from "@/mixins/resToken";
 import { getNotice, setNotice } from "@/utils/auth";
 
 export default {
-  components: {
-    mainMenu,
-    Hamburger,
-    Screenfull,
-    SizeSelect,
-  },
   computed: {
     ...mapGetters(["sidebar", "avatar", "device"]),
   },

+ 0 - 2
src/layout/components/Settings/index.vue

@@ -30,10 +30,8 @@
 </template>
 
 <script>
-import ThemePicker from '@/components/ThemePicker'
 
 export default {
-  components: { ThemePicker },
   data() {
     return {}
   },

+ 0 - 2
src/layout/index.vue

@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import RightPanel from "@/components/RightPanel";
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
 import ResizeMixin from "./mixin/ResizeHandler";
 import { mapState } from "vuex";
@@ -30,7 +29,6 @@ export default {
   components: {
     AppMain,
     Navbar,
-    RightPanel,
     Settings,
     Sidebar,
     TagsView,

+ 2 - 6
src/main.js

@@ -6,7 +6,6 @@ import {
   getToken, removeMenu,
   removeBtn, removeToken
 } from '@/utils/auth'
-import noAuth from './components/NoAuth/index.vue'
 import ElementUI from 'element-ui'
 import 'viewerjs/dist/viewer.css'
 
@@ -14,13 +13,11 @@ import "element-ui/lib/theme-chalk/display.css";
 import "./styles/element-variables.scss";
 
 import './styles/index.scss' // global css
-import globalComponents from './components/global'
+import globalComponents from './components'
 import App from './App'
 import store from './store'
 import base from './assets/utils/prototype/index'
 require('./mock')
-// import './icons' // icon
-// import './utils/error-log' // error log
 
 import * as filters from './filters' // global filters
 
@@ -36,8 +33,7 @@ if (typeof String.prototype.startsWith != "function") {
     return this.slice(0, prefix.length) === prefix;
   };
 }
-// 暂无权限
-Vue.component('noAuth', noAuth)
+
 Vue.use(globalComponents)
 Vue.use(Viewer, {
   defaultOptions: {

+ 0 - 3
src/views/dashboard/index.vue

@@ -13,13 +13,10 @@
 </template>
 
 <script>
-import PanThumb from "@/components/PanThumb";
-import GithubCorner from "@/components/GithubCorner";
 import { mapGetters } from "vuex";
 
 export default {
   name: "dashboard",
-  components: { GithubCorner, PanThumb },
   data() {
     return {
       emptyGif: require("@/assets/img/welcome.gif"),

+ 0 - 2
src/views/interest/account/index.vue

@@ -209,7 +209,6 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/interest/account";
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import resetPassword from "./resetPassword";
 import statusList from "@/assets/js/statusList";
@@ -219,7 +218,6 @@ export default {
   name: "Account",
   components: {
     addEdit,
-    ExTable,
     resetPassword,
   },
   mixins: [mixinPage, resToken],

+ 0 - 2
src/views/interest/dataShare/index.vue

@@ -130,7 +130,6 @@
   </div>
 </template>
 <script>
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/interest/dataShare";
 import statusList from "@/assets/js/statusList";
@@ -142,7 +141,6 @@ export default {
   name: "role",
   mixins: [mixinPage, resToken],
   components: {
-    ExTable,
     addEdit,
   },
   computed: {

+ 0 - 2
src/views/interest/group/index.vue

@@ -136,7 +136,6 @@
   </div>
 </template>
 <script>
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/interest/group";
 import mixinPage from "@/mixins/elPaginationHandle";
@@ -146,7 +145,6 @@ export default {
   name: "group",
   mixins: [mixinPage, resToken],
   components: {
-    ExTable,
     addEdit,
   },
   computed: {

+ 0 - 2
src/views/interest/handover/index.vue

@@ -184,7 +184,6 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/interest/account";
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import statusList from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
@@ -193,7 +192,6 @@ export default {
   name: "Account",  
   components: {
     addEdit,
-    ExTable,
   },
   mixins: [mixinPage, resToken],
   computed: {

+ 0 - 2
src/views/interest/organize/index copy.vue

@@ -223,7 +223,6 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/interest/organize";
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import statusList from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
@@ -232,7 +231,6 @@ export default {
   name: "organize",
   components: {
     addEdit,
-    ExTable,
   },
   mixins: [mixinPage, resToken],
   computed: {

+ 0 - 2
src/views/interest/role/index.vue

@@ -203,7 +203,6 @@
   </div>
 </template>
 <script>
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/interest/role";
 import statusList from "@/assets/js/statusList";
@@ -215,7 +214,6 @@ export default {
   name: "role",
   mixins: [mixinPage, resToken],
   components: {
-    ExTable,
     addEdit,
   },
   computed: {

+ 2 - 2
src/views/login/forget-password.vue

@@ -156,12 +156,12 @@ import {
   isAlphanumeric,
   validAlphabets,
 } from "@/utils/validate";
-import SocialSign from "@/components/SendVerificationCode";
+// import SocialSign from "@/components/SendVerificationCode";
 import asyncRequest from "@/apis/service/user/index";
 import resToken from "@/mixins/resToken";
 export default {
   name: "Login",
-  components: { SocialSign },
+  // components: { SocialSign },
   mixins:[resToken],
   data() {
     const validateUsername = (rule, value, callback) => {

+ 0 - 2
src/views/parameter/finance/index.vue

@@ -126,7 +126,6 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/parameter/finance";
-import ExTable from "@/components/ExTableNew.vue";
 import mixinPage from "@/mixins/elPaginationHandle";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
@@ -134,7 +133,6 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "finance",
   components: {
-    ExTable,
     addEdit,
   },
   mixins: [mixinPage, resToken],

+ 2 - 2
src/views/person-infor/change-phone.vue

@@ -53,12 +53,12 @@
 
 <script>
 import { isMobile, isnumber } from "@/utils/validate";
-import SocialSign from "@/components/SendVerificationCode";
+// import SocialSign from "@/components/SendVerificationCode";
 import asyncRequest from "@/apis/service/user/index";
 import resToken from "@/mixins/resToken";
 export default {
   name: "Login",
-  components: { SocialSign },
+  // components: { SocialSign },
   mixins:[resToken],
   data() {
     const validatemobile = (rule, value, callback) => {

+ 0 - 2
src/views/process/done/index.vue

@@ -132,7 +132,6 @@
   </div>
 </template>
 <script>
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 // import asyncRequest from "@/apis/service/process/done";
 import asyncRequest from "@/mock/service/process/done"; //引入mock数据
@@ -143,7 +142,6 @@ export default {
   name: "done",
   mixins: [mixinPage, resToken],
   components: {
-    ExTable,
     addEdit,
   },
   computed: {

+ 0 - 2
src/views/process/oing/index.vue

@@ -130,7 +130,6 @@
   </div>
 </template>
 <script>
-import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 // import asyncRequest from "@/apis/service/process/oing";
 import asyncRequest from "@/mock/service/process/oing"; //引入mock数据
@@ -143,7 +142,6 @@ export default {
   name: "role",
   mixins: [mixinPage, resToken],
   components: {
-    ExTable,
     addEdit,
   },
   computed: {

+ 0 - 6
src/views/purchaseIn/addStore/index.vue

@@ -292,13 +292,10 @@ import asyncRequest from "@/apis/service/purchaseIn/addStore";
 // import resToken from "@/mixins/resToken";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 // import statusList from "@/assets/js/statusList";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
-import AreaSelect from "@/components/AreaSelect.vue"; //省/市/区选择组件
 import { isMobile } from "@/utils/validate";
-import CompanySearch from "@/components/companySearch";
 export default {
   name: "addStore",
   // props: ["showModel", "id", "isDetail", "sitem"],
@@ -306,9 +303,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
-    AreaSelect, //省/市/区选择组件
-    CompanySearch, //获取公司列表组件
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 2
src/views/purchaseIn/storeGoods/index.vue

@@ -195,7 +195,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/purchaseIn/storeGoods";
 import addEdit from "./addEdit";
@@ -206,7 +205,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 4
src/views/purchaseIn/storeSet/index.vue

@@ -284,20 +284,16 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/purchaseIn/storeSet";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
-import PeriodDatePicker from "@/components/PeriodDatePicker"; //时间选择器
 import AddStore from "@/views/purchaseIn/addStore";
 export default {
   name: "storeSet",
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
-    PeriodDatePicker,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 4
src/views/report/addEdit.vue

@@ -80,14 +80,10 @@
 </template>
    <script>
 import asyncRequest from "@/apis/service/report";
-import PeriodDatePicker from "@/components/PeriodDatePicker";
 import resToken from "@/mixins/resToken";
 export default {
   name: "report",
   props: ["showModel", "id", "isDetail"],
-  components: {
-    PeriodDatePicker,
-  },
   mixins:[resToken],
   data() {
     return {

+ 0 - 2
src/views/report/index.vue

@@ -147,7 +147,6 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/report";
 import addEdit from "./addEdit";
-import ExTableNew from "@/components/ExTableNew";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 export default {
@@ -244,7 +243,6 @@ export default {
   },
   components: {
     addEdit,
-    ExTableNew,
   },
   methods: {
     restSearch() {

+ 0 - 6
src/views/search/commission/index.vue

@@ -123,9 +123,7 @@
   </div>
 </template>
 <script>
-import ExTable from "@/components/ExTableNew.vue";
 import asyncRequest from "@/apis/service/search/commission";
-import PeriodDatePicker from "@/components/PeriodDatePicker";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
@@ -133,10 +131,6 @@ import urlConfig from "@/apis/url-config";
 export default {
   name: "commission",
   mixins: [mixinPage, resToken],
-  components: {
-    ExTable,
-    PeriodDatePicker,
-  },
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 4
src/views/search/standBook/index.vue

@@ -69,14 +69,10 @@
 <script>
 import resToken from "@/mixins/resToken";
 import urlConfig from "@/apis/url-config";
-import PeriodDatePicker from "@/components/PeriodDatePicker";
 import { mapGetters } from "vuex";
 export default {
   name: "standBook",
   mixins: [resToken],
-  components: {
-    PeriodDatePicker,
-  },
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 4
src/views/stock/allot/index.vue

@@ -155,22 +155,18 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/allot";
 import asyncRequest from "@/mock/service/stock/allot";
 
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
-import PeriodDatePicker from "@/components/PeriodDatePicker";
 import AllotFlow from "@/views/stock/allotFlow";
 export default {
   name: "allot",
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
-    PeriodDatePicker,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 4
src/views/stock/allotFlow/addEdit.vue

@@ -52,7 +52,6 @@
    <script>
 import asyncRequest from "@/apis/service/stock/newApply";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 
 import {
   isnumber,
@@ -67,9 +66,6 @@ export default {
   name: "newApply",
   props: ["showModel", "id", "isDetail", "sitem"],
   mixins: [resToken],
-  components: {
-    ExTable,
-  },
   data() {
     const validateusername = (rule, value, callback) => {
       // if (value === "") {

+ 0 - 4
src/views/stock/allotFlow/components/addEdit-newApply.vue

@@ -54,7 +54,6 @@
    <script>
 import asyncRequest from "@/apis/service/stock/newApply";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 
 import {
   isnumber,
@@ -69,9 +68,6 @@ export default {
   name: "newApply",
   props: ["showModel", "id", "isDetail", "sitem"],
   mixins: [resToken],
-  components: {
-    ExTable,
-  },
   data() {
     const validateusername = (rule, value, callback) => {
       // if (value === "") {

+ 0 - 2
src/views/stock/allotFlow/components/checkStock.vue

@@ -259,7 +259,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/newApply";
 import asyncRequest from "@/mock/service/stock/newApply";
@@ -271,7 +270,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 2
src/views/stock/allotFlow/components/goStock-audit.vue

@@ -79,7 +79,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/newApply";
 import asyncRequest from "@/mock/service/stock/newApply";
@@ -92,7 +91,6 @@ export default {
   props: ["myType"],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 2
src/views/stock/allotFlow/components/inStock-audit.vue

@@ -69,7 +69,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/newApply";
 import asyncRequest from "@/mock/service/stock/newApply";
@@ -82,7 +81,6 @@ export default {
   props: ["myType"],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 2
src/views/stock/allotFlow/components/inStock-check.vue

@@ -128,7 +128,6 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/newApply";
 import asyncRequest from "@/mock/service/stock/newApply";
@@ -141,7 +140,6 @@ export default {
   props: ["myType"],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 2
src/views/stock/allotFlow/components/newApply.vue

@@ -156,7 +156,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/newApply";
 import asyncRequest from "@/mock/service/stock/newApply";
@@ -168,7 +167,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 6
src/views/stock/allotFlow/index.vue

@@ -43,7 +43,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/newApply";
 import asyncRequest from "@/mock/service/stock/newApply";
@@ -54,22 +53,17 @@ import InStock from "./components/inStock-audit.vue"; //入库方审核界面
 import GoStock from "./components//goStock-audit.vue"; //出库方发货
 import InStockCheck from "./components/inStock-check.vue"; //入库方验货
 import CheckStock from "./components/checkStock.vue"; //验货审核
-import StockSearch from "@/components/stockSearch.vue";
-import CompanySearch from "@/components/companySearch.vue";
 
 export default {
   name: "newApply",
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
     NewApply,
     InStock,
     GoStock,
     InStockCheck,
     CheckStock,
-    StockSearch,
-    CompanySearch,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 2
src/views/stock/check/index.vue

@@ -201,7 +201,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/check";
 import addEdit from "./addEdit";
@@ -212,7 +211,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 0 - 2
src/views/stock/dataWeido/index.vue

@@ -244,7 +244,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/mock/service/stock/dataWeido";
 // import asyncRequest from "@/apis/service/stock/dataWeido";
@@ -257,7 +256,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

+ 378 - 393
src/views/stock/my-test/index.vue

@@ -1,418 +1,403 @@
 <template>
-    <div class="my-test pagePadding">
+  <div class="my-test pagePadding">
     <div
-    v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-  >
-    <ex-table
-      v-loading="loading"
-      :table="table"
-      :data="tableData"
-      :columns="columns"
-      :page="pageInfo"
-      :size="size"
-      @page-curr-change="handlePageChange"
-      @page-size-change="handleSizeChange"
-      @screen-reset="
-        pageInfo.curr = 1;
-        parmValue.page = 1;
-        searchList();
-      "
-      @screen-submit="
-        pageInfo.curr = 1;
-        parmValue.page = 1;
-        searchList();
-      "
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <template #table-header="{}">
-        <div style="width: 100%">
-          <el-row style="padding: 0 0 0 80px">
-            <el-col :span="24">
-              <el-col :span="4" style="width: 120px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  filterable
-                  clearable
-                  placeholder="账号状态"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in statusList"
-                    :key="'status' + item.code"
-                    :label="item.name"
-                    :value="item.code"
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="24">
+                <el-col :span="4" style="width: 120px">
+                  <el-select
+                    :size="searchSize"
+                    v-model="parmValue.status"
+                    filterable
+                    clearable
+                    placeholder="账号状态"
+                    style="width: 100%"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                    <el-option
+                      v-for="item in statusList"
+                      :key="'status' + item.code"
+                      :label="item.name"
+                      :value="item.code"
+                    />
+                  </el-select>
+                </el-col>
+                <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="searchSize"
+                    v-model="parmValue.name"
+                    :maxlength="40"
+                    placeholder="业务员姓名"
                   />
-                </el-select>
-              </el-col>
-              <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
-                <el-input
-                  :size="searchSize"
-                  v-model="parmValue.name"
-                  :maxlength="40"
-                  placeholder="业务员姓名"
-                />
-              </el-col>
-              <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
-                <el-input
-                  :size="searchSize"
-                  v-model="parmValue.username"
-                  :maxlength="40"
-                  placeholder="手机号"
-                />
-              </el-col>
-              <el-col :span="4" style="width: 54px">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  class="fr"
-                  icon="el-icon-search"
-                  @click="searchList"
-              /></el-col>
-              <el-col
-                :span="4"
-                style="width: 66px"
-              >
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
-              <el-col
-                :span="3"
-                style="width: 66px; float: right"
-              >
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
+                </el-col>
+                <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="searchSize"
+                    v-model="parmValue.username"
+                    :maxlength="40"
+                    placeholder="手机号"
+                  />
+                </el-col>
+                <el-col :span="4" style="width: 54px">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    class="fr"
+                    icon="el-icon-search"
+                    @click="searchList"
+                /></el-col>
+                <el-col :span="4" style="width: 66px">
+                  <el-button
+                    type="warning"
+                    class="fr"
+                    :size="searchSize"
+                    @click="restSearch"
+                  >
+                    重置
+                  </el-button>
+                </el-col>
+                <el-col :span="3" style="width: 66px; float: right">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    style="float: right; margin-left: 5px"
+                    @click="searchList"
+                  >
+                    刷新
+                  </el-button>
+                </el-col>
               </el-col>
-            </el-col>
-          </el-row>
-        </div>
-      </template>
-      <template #status="{ scope }">
-        <el-tag
-          :size="tablebtnSize"
-          :type="scope.row.status == '0' ? 'warning' : ''"
-          v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .label || '--'
-          "
-        ></el-tag>
-      </template>
-      <template #operation="{ scope }">
-        <el-tooltip
-          v-if="powers.some((item) => item == '002')"
-           
-          effect="dark"
-          content="重置密码"
-          placement="top"
-        >
-          <i
-            class="el-icon-refresh-left tb-icon"
-            @click="openPasswordModal(scope.row.id, false)"
-          ></i>
-        </el-tooltip>
+            </el-row>
+          </div>
+        </template>
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((item) => item == '002')"
+            effect="dark"
+            content="重置密码"
+            placement="top"
+          >
+            <i
+              class="el-icon-refresh-left tb-icon"
+              @click="openPasswordModal(scope.row.id, false)"
+            ></i>
+          </el-tooltip>
 
-        <el-tooltip
-          v-if="powers.some((item) => item == '007')"
-           
-          effect="dark"
-          content="详情"
-          placement="top"
-        >
-          <i
-            class="el-icon-view tb-icon"
-            @click="openModal(scope.row.id, true, scope.row)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="powers.some((item) => item == '005')"
-           
-          effect="dark"
-          content="修改"
-          placement="top"
-        >
-          <i
-            class="el-icon-edit tb-icon"
-            @click="openModal(scope.row.id, false, scope.row)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
-          "
-           
-          effect="dark"
-          content="禁用"
-          placement="top"
-        >
-          <i
-            class="el-icon-video-pause tb-icon"
-            @click="statusConfirm(scope.row.id, scope.row.status)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
-          "
-           
-          effect="dark"
-          content="启用"
-          placement="top"
-        >
-          <i
-            class="el-icon-video-play tb-icon"
-            @click="statusConfirm(scope.row.id, scope.row.status)"
-          ></i>
-        </el-tooltip>
-      </template>
-    </ex-table>
-    <add-edit
-      :id="modelId"
-      :sitem="sitem"
-      :show-model="showModel"
-      :is-detail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    />
-  </div>
-  <div v-else>
-    <no-auth></no-auth>
-  </div>
-       
-   
+          <el-tooltip
+            v-if="powers.some((item) => item == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="openModal(scope.row.id, true, scope.row)"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            v-if="powers.some((item) => item == '005')"
+            effect="dark"
+            content="修改"
+            placement="top"
+          >
+            <i
+              class="el-icon-edit tb-icon"
+              @click="openModal(scope.row.id, false, scope.row)"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            v-if="
+              powers.some((item) => item == '004') && scope.row.status === '1'
+            "
+            effect="dark"
+            content="禁用"
+            placement="top"
+          >
+            <i
+              class="el-icon-video-pause tb-icon"
+              @click="statusConfirm(scope.row.id, scope.row.status)"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            v-if="
+              powers.some((item) => item == '004') && scope.row.status === '0'
+            "
+            effect="dark"
+            content="启用"
+            placement="top"
+          >
+            <i
+              class="el-icon-video-play tb-icon"
+              @click="statusConfirm(scope.row.id, scope.row.status)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
       <add-edit
-        :showModel="showModel"
         :id="modelId"
-        :isDetail="isDetail"
+        :sitem="sitem"
+        :show-model="showModel"
+        :is-detail="isDetail"
         @refresh="searchList"
         @cancel="showModel = false"
-      ></add-edit>
+      />
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
     </div>
-   </template>
+
+    <add-edit
+      :showModel="showModel"
+      :id="modelId"
+      :isDetail="isDetail"
+      @refresh="searchList"
+      @cancel="showModel = false"
+    ></add-edit>
+  </div>
+</template>
    <script>
-    import mixinPage from "@/mixins/elPaginationHandle";
-    import resToken from "@/mixins/resToken";
-    import ExTable from "@/components/ExTableNew.vue";
-    import statusList from "@/assets/js/statusList";
-    import asyncRequest from "@/apis/service/stock/my-test";
-    import addEdit from "./addEdit";
-    import { mapGetters } from "vuex";
-   
-   export default {
-    name: 'my-test',
-    mixins: [mixinPage, resToken],
-    components: {
-      addEdit,
-      ExTable,
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import statusList from "@/assets/js/statusList";
+import asyncRequest from "@/apis/service/stock/my-test";
+import addEdit from "./addEdit";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "my-test",
+  mixins: [mixinPage, resToken],
+  components: {
+    addEdit,
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "my-test"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
     },
-    computed: {
-      ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-      powers() {
-        let tran =
-          this.$store.getters.btnList.find(
-            (item) => item.menu_route == "my-test"
-          ) || {};
-        if (tran && tran.action && tran.action.length > 0) {
-          return tran.action;
-        } else {
-          return [];
-        }
+  },
+  data() {
+    return {
+      sitem: null,
+      // 状态
+      statusOptions: [
+        { id: "0", label: "禁用" },
+        { id: "1", label: "启用" },
+      ],
+      statusList: statusList,
+      loading: true,
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      parmValue: {
+        name: "", // 业务员名字
+        username: "", // 账号
+        status: "", //
+        page: 1, // 页码
+        size: 15, // 每页显示条数
       },
-    },
-    data() {
-      return {
-        sitem: null,
-        // 状态
-        statusOptions: [
-          { id: "0", label: "禁用" },
-          { id: "1", label: "启用" },
-        ],
-        statusList: statusList,
-        loading: true,
-        showModel: false,
-        isDetail: false,
-        modelId: 0,
-        parmValue: {
-          name: "", // 业务员名字
-          username: "", // 账号
-          status: "", //
-          page: 1, // 页码
-          size: 15, // 每页显示条数
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: [
+        {
+          prop: "nickname",
+          label: "真实姓名",
+        },
+        {
+          prop: "role_name",
+          label: "角色名称",
+        },
+        {
+          prop: "mobile",
+          label: "联系电话",
         },
-        tableData: [],
-        passwordModel: false,
-        passwordModelId: 0,
-        isPasswordDetail: false,
-        // 表格 - 数据
-        tableData: [],
-        // 表格 - 参数
-        table: {
-          stripe: true,
-          border: true,
-          _defaultHeader_: ["setcol"],
+        {
+          prop: "email",
+          label: "邮箱",
         },
-        // 表格 - 分页
-        pageInfo: {
-          size: 15,
-          curr: 1,
-          total: 0,
+        {
+          prop: "status",
+          label: "状态",
+          _slot_: "status",
+          width: "80px",
         },
-        // 表格 - 列参数
-        columns: [
-          {
-            prop: "nickname",
-            label: "真实姓名",
-          },
-          {
-            prop: "role_name",
-            label: "角色名称",
-          },
-          {
-            prop: "mobile",
-            label: "联系电话",
-          },
-          {
-            prop: "email",
-            label: "邮箱",
-          },
-          {
-            prop: "status",
-            label: "状态",
-            _slot_: "status",
-            width: "80px",
-          },
-          {
-            prop: "addtime",
-            label: "创建时间",
-            sortable: true,
-          },
-          {
-            prop: "",
-            label: "操作",
-            fixed: "right",
-            _noset_: true,
-            _slot_: "operation",
-          },
-        ],
+        {
+          prop: "addtime",
+          label: "创建时间",
+          sortable: true,
+        },
+        {
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          _slot_: "operation",
+        },
+      ],
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+
+  methods: {
+    restSearch() {
+      this.parmValue = {
+        name: "", // 业务员名字
+        username: "", // 账号
+        status: "", //
+        page: 1, // 页码
+        size: 10, // 每页显示条数
       };
-    },
-    mounted() {
       this.searchList();
     },
-  
-    methods: {
-      restSearch() {
-        this.parmValue = {
-          name: "", // 业务员名字
-          username: "", // 账号
-          status: "", //
-          page: 1, // 页码
-          size: 10, // 每页显示条数
-        };
-        this.searchList();
-      },
-      
-      openModal(id, isDetail, sitem) {
-        this.showModel = true;
-        this.modelId = id;
-        this.isDetail = isDetail;
-        this.sitem = sitem;
-      },
-      async deleteById(id, status) {
-        await this.$confirm("确定要删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+
+    openModal(id, isDetail, sitem) {
+      this.showModel = true;
+      this.modelId = id;
+      this.isDetail = isDetail;
+      this.sitem = sitem;
+    },
+    async deleteById(id, status) {
+      await this.$confirm("确定要删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: id,
+            status: status === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
         })
-          .then(async () => {
-            const model = {
-              id: id,
-              status: status === "1" ? "0" : "1",
-            };
-            const res = await asyncRequest.status(model);
-            if (res && res.code === 0) {
-              this.$notify.success({
-                title: "删除成功",
-                message: "",
-              });
-              this.searchList();
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              this.$message.warning(res.message);
-            }
-          })
-          .catch(() => {
-            console.log("取消");
-          });
-      },
-      async searchList() {
-        this.loading = true;
-        const res = await asyncRequest.list(this.parmValue);
-        if (res && res.code === 0 && res.data) {
-          this.tableData = res.data.list;
-          this.pageInfo.total = Number(res.data.count);
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.tableData = [];
-          this.pageInfo.total = 0;
-        }
-        this.loading = false;
-      },
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.list(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
 
-      async statusConfirm(id, status) {
-        let str= status === "1" ? "禁用" : "启用"
-        await this.$confirm('确定要改为'+str+'?',{
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+    async statusConfirm(id, status) {
+      let str = status === "1" ? "禁用" : "启用";
+      await this.$confirm("确定要改为" + str + "?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            id: id,
+            status: status === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "状态修改成功!",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
         })
-          .then(async () => {
-            this.loading = true;
-            const model = {
-              id: id,
-              status: status === "1" ? "0" : "1",
-            };
-            const res = await asyncRequest.status(model);
-            if (res && res.code === 0) {
-              this.loading = false;
-              this.$notify.success({
-                title: "状态修改成功!",
-                message: "",
-              });
-              await this.searchList();
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              this.$message.warning(res.message);
-            }
-          })
-          .catch(() => {
-            console.log("取消");
-          });
-      },
-    }
-   }
-   </script>
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+  },
+};
+</script>
    <style lang="scss" scoped>
-   .my-test {
-    
-   }
-   </style>
+.my-test {
+}
+</style>
    

+ 0 - 2
src/views/stock/productWeido/index.vue

@@ -245,7 +245,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
 import statusList from "@/assets/js/statusList";
 // import asyncRequest from "@/apis/service/stock/productWeido";
 import asyncRequest from "@/mock/service/stock/allot"; //获取商品假数据
@@ -258,7 +257,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    ExTable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),

Some files were not shown because too many files changed in this diff