فهرست منبع

fix: 调整bug

zh 2 سال پیش
والد
کامیت
bf47a5a438
29فایلهای تغییر یافته به همراه7 افزوده شده و 2495 حذف شده
  1. 0 37
      .history/src/api/stock_20220720145422.js
  2. 0 46
      .history/src/api/stock_20220818144734.js
  3. 0 7
      .history/src/views/basic_data/stock/product_list_20220818143421.vue
  4. 0 7
      .history/src/views/basic_data/stock/product_list_20220818143532.vue
  5. 0 73
      .history/src/views/basic_data/stock/product_list_20220818143704.vue
  6. 0 73
      .history/src/views/basic_data/stock/product_list_20220818143730.vue
  7. 0 68
      .history/src/views/basic_data/stock/product_list_20220818143739.vue
  8. 0 71
      .history/src/views/basic_data/stock/product_list_20220818144052.vue
  9. 0 81
      .history/src/views/basic_data/stock/product_list_20220818144133.vue
  10. 0 110
      .history/src/views/basic_data/stock/product_list_20220818144316.vue
  11. 0 112
      .history/src/views/basic_data/stock/product_list_20220818144338.vue
  12. 0 124
      .history/src/views/basic_data/stock/product_list_20220818144428.vue
  13. 0 138
      .history/src/views/basic_data/stock/product_list_20220818144456.vue
  14. 0 141
      .history/src/views/basic_data/stock/product_list_20220818144523.vue
  15. 0 166
      .history/src/views/basic_data/stock/product_list_20220818144541.vue
  16. 0 167
      .history/src/views/basic_data/stock/product_list_20220818144800.vue
  17. 0 177
      .history/src/views/basic_data/stock/product_list_20220818144930.vue
  18. 0 177
      .history/src/views/basic_data/stock/product_list_20220818144933.vue
  19. 0 177
      .history/src/views/basic_data/stock/product_list_20220818144956.vue
  20. 0 177
      .history/src/views/basic_data/stock/product_list_20220818145008.vue
  21. 0 177
      .history/src/views/basic_data/stock/product_list_20220818145018.vue
  22. 0 175
      .history/src/views/basic_data/stock/product_list_20220818145031.vue
  23. 0 0
      .history/src/views/stock/product_list_20220818143314.vue
  24. 0 3
      .history/src/views/stock/product_list_20220818143351.vue
  25. 0 3
      .history/src/views/stock/product_list_20220818143354.vue
  26. 0 7
      .history/src/views/stock/product_list_20220818143422.vue
  27. 1 0
      src/components/Common/file-upload.vue
  28. 1 0
      src/views/basic_data/sectorAllocation.vue
  29. 5 1
      src/views/commercialEngineering/components/base.vue

+ 0 - 37
.history/src/api/stock_20220720145422.js

@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 获取库存列表
-export function getStockList(params) {
-  return request({
-    url: '/stock/manager/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取仓库列表
-export function getWarehouseList(params) {
-  return request({
-    url: '/stock/listStock',
-    method: 'get',
-    params
-  })
-}
-
-// 获取销售类型列表
-export function getSalesTypeList(params) {
-  return request({
-    url: '/sale/type/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取预留库存列表
-export function getReservedList(params) {
-  return request({
-    url: '/stock/manager/listCustomer',
-    method: 'get',
-    params
-  })
-}

+ 0 - 46
.history/src/api/stock_20220818144734.js

@@ -1,46 +0,0 @@
-import request from '@/utils/request'
-
-// 获取库存列表
-export function getStockList(params) {
-  return request({
-    url: '/stock/manager/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取仓库列表
-export function getWarehouseList(params) {
-  return request({
-    url: '/stock/listStock',
-    method: 'get',
-    params
-  })
-}
-
-// 获取销售类型列表
-export function getSalesTypeList(params) {
-  return request({
-    url: '/sale/type/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取预留库存列表
-export function getReservedList(params) {
-  return request({
-    url: '/stock/manager/listCustomer',
-    method: 'get',
-    params
-  })
-}
-
-// 获取仓库现存列表
-export function getListStockToDay(params) {
-  return request({
-    url: '/stock/manager/listStockToDay',
-    method: 'get',
-    params
-  })
-}

+ 0 - 7
.history/src/views/basic_data/stock/product_list_20220818143421.vue

@@ -1,7 +0,0 @@
-<template>
-  <div class="app-container">554</div>
-</template>
-
-<script>
-export default {}
-</script>

+ 0 - 7
.history/src/views/basic_data/stock/product_list_20220818143532.vue

@@ -1,7 +0,0 @@
-<template>
-  <div class="app-container">554</div>
-</template>
-
-<script>
-export default {}
-</script>

+ 0 - 73
.history/src/views/basic_data/stock/product_list_20220818143704.vue

@@ -1,73 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品大类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择产品大类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="规格型号" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商编号" prop="jxsNum">
-              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="jxsName">
-              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      }
-    }
-  }
-}
-</script>

+ 0 - 73
.history/src/views/basic_data/stock/product_list_20220818143730.vue

@@ -1,73 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品大类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择产品大类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="规格型号" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商编号" prop="jxsNum">
-              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="jxsName">
-              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      }
-    }
-  }
-}
-</script>

+ 0 - 68
.history/src/views/basic_data/stock/product_list_20220818143739.vue

@@ -1,68 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <!-- <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品大类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择产品大类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="规格型号" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商编号" prop="jxsNum">
-              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="jxsName">
-              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      }
-    }
-  }
-}
-</script>

+ 0 - 71
.history/src/views/basic_data/stock/product_list_20220818144052.vue

@@ -1,71 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <!-- <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      }
-    }
-  }
-}
-</script>

+ 0 - 81
.history/src/views/basic_data/stock/product_list_20220818144133.vue

@@ -1,81 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <!-- <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: []
-    }
-  },
-
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    }
-  }
-}
-</script>

+ 0 - 110
.history/src/views/basic_data/stock/product_list_20220818144316.vue

@@ -1,110 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: []
-    }
-  },
-
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    }
-  }
-}
-</script>

+ 0 - 112
.history/src/views/basic_data/stock/product_list_20220818144338.vue

@@ -1,112 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: [],
-      dataList: [],
-      listLoading: false
-    }
-  },
-
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    }
-  }
-}
-</script>

+ 0 - 124
.history/src/views/basic_data/stock/product_list_20220818144428.vue

@@ -1,124 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: [],
-      dataList: [],
-      listLoading: false
-    }
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum
-      }
-    }
-  },
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    }
-  }
-}
-</script>

+ 0 - 138
.history/src/views/basic_data/stock/product_list_20220818144456.vue

@@ -1,138 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: [],
-      dataList: [],
-      listLoading: false
-    }
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum
-      }
-    }
-  },
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    }
-  }
-}
-</script>

+ 0 - 141
.history/src/views/basic_data/stock/product_list_20220818144523.vue

@@ -1,141 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: []
-    }
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum
-      }
-    }
-  },
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    }
-  }
-}
-</script>

+ 0 - 166
.history/src/views/basic_data/stock/product_list_20220818144541.vue

@@ -1,166 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: []
-    }
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum
-      }
-    }
-  },
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1
-      this.getList()
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields()
-      this.currentPage = 1
-      this.getList()
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val
-      this.currentPage = 1
-      this.getList()
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val
-      this.getList()
-    }
-  }
-}
-</script>

+ 0 - 167
.history/src/views/basic_data/stock/product_list_20220818144800.vue

@@ -1,167 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getListStockToDay } "@/api/stock"
-import { getDictList } from "@/api/common";
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
-      },
-      typeList: [],
-    };
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
-  },
-  methods: {
-    getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
-</script>

+ 0 - 177
.history/src/views/basic_data/stock/product_list_20220818144930.vue

@@ -1,177 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getListStockToDay } "@/api/stock"
-import { getDictList } from "@/api/common";
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
-      },
-      typeList: [],
-    };
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
-  },
-  methods: {
-
-    getList(){
-      const parmas = {
-        pageNum:
-      }
-      getListStockToDay().then(res=>{
-        this.dataList = res.data.records
-      })
-    }
-
-    getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
-</script>

+ 0 - 177
.history/src/views/basic_data/stock/product_list_20220818144933.vue

@@ -1,177 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getListStockToDay } "@/api/stock"
-import { getDictList } from "@/api/common";
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
-      },
-      typeList: [],
-    };
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
-  },
-  methods: {
-
-    getList(){
-      const parmas = {
-        pageNum:1
-      }
-      getListStockToDay().then(res=>{
-        this.dataList = res.data.records
-      })
-    }
-
-    getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
-</script>

+ 0 - 177
.history/src/views/basic_data/stock/product_list_20220818144956.vue

@@ -1,177 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getListStockToDay } "@/api/stock";
-import { getDictList } from "@/api/common";
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
-      },
-      typeList: [],
-    };
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
-  },
-  methods: {
-
-    getList(){
-      const parmas = {
-        pageNum:1
-      }
-      getListStockToDay().then(res=>{
-        this.dataList = res.data.records
-      })
-    }
-
-    getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
-</script>

+ 0 - 177
.history/src/views/basic_data/stock/product_list_20220818145008.vue

@@ -1,177 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getListStockToDay } "@/api/stock";
-import { getDictList } from "@/api/common";
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
-      },
-      typeList: [],
-    };
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
-  },
-  methods: {
-
-    getList(){
-      const parmas = {
-        pageNum:1
-      }
-      getListStockToDay().then(res=>{
-        this.dataList = res.data.records
-      })
-    }
-
-    getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
-</script>

+ 0 - 177
.history/src/views/basic_data/stock/product_list_20220818145018.vue

@@ -1,177 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getListStockToDay } from "@/api/stock";
-import { getDictList } from "@/api/common";
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
-      },
-      typeList: [],
-    };
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
-  },
-  methods: {
-
-    getList(){
-      const parmas = {
-        pageNum:1
-      }
-      getListStockToDay().then(res=>{
-        this.dataList = res.data.records
-      })
-    }
-
-    getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
-</script>

+ 0 - 175
.history/src/views/basic_data/stock/product_list_20220818145031.vue

@@ -1,175 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂产品代码" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="品类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'stock/manager/export'" :exParams="exParams" />
-        </div>
-      </div>
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{ scope.row.customerNumber }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getListStockToDay } from '@/api/stock'
-import { getDictList } from '@/api/common'
-export default {
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: null, // 列表数据
-      listLoading: false, // 列表加载loading
-      screenForm: {
-        // 筛选表单数据
-        type: '',
-        goodsName: '',
-        goodsNum: '',
-        model: '',
-        jxsName: '',
-        jxsNum: ''
-      },
-      typeList: []
-    }
-  },
-
-  computed: {
-    exParams() {
-      return {
-        materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        specification: this.screenForm.model,
-        mainNumber: this.screenForm.type,
-        customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum
-      }
-    }
-  },
-  methods: {
-    getList() {
-      const parmas = {
-        pageNum: 1
-      }
-      getListStockToDay().then(res => {
-        this.dataList = res.data.records
-      })
-    },
-    getDictList() {
-      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
-        this.typeList = res.data
-      })
-    },
-    // 提交筛选表单
-    submitScreenForm() {
-      this.currentPage = 1
-      this.getList()
-    },
-
-    // 重置筛选表单
-    resetScreenForm() {
-      this.$refs.screenForm.resetFields()
-      this.currentPage = 1
-      this.getList()
-    },
-
-    // 更改每页数量
-    handleSizeChange(val) {
-      this.pageSize = val
-      this.currentPage = 1
-      this.getList()
-    },
-
-    // 更改当前页
-    handleCurrentChange(val) {
-      this.currentPage = val
-      this.getList()
-    }
-  }
-}
-</script>

+ 0 - 0
.history/src/views/stock/product_list_20220818143314.vue


+ 0 - 3
.history/src/views/stock/product_list_20220818143351.vue

@@ -1,3 +0,0 @@
-<template>
-  <div class="app-container"></div>
-</template>

+ 0 - 3
.history/src/views/stock/product_list_20220818143354.vue

@@ -1,3 +0,0 @@
-<template>
-  <div class="app-container">554</div>
-</template>

+ 0 - 7
.history/src/views/stock/product_list_20220818143422.vue

@@ -1,7 +0,0 @@
-<template>
-  <div class="app-container">554</div>
-</template>
-
-<script>
-export default {}
-</script>

+ 1 - 0
src/components/Common/file-upload.vue

@@ -93,6 +93,7 @@ export default {
       // this.fileList = [{ name: '', url: '' }];
     },
     beforeUpload(file) {
+      console.log(file, 999)
       const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1)
       const imgList = ['jpg', 'jpeg', 'png']
       const videoList = ['mp4']

+ 1 - 0
src/views/basic_data/sectorAllocation.vue

@@ -20,6 +20,7 @@
         border
         lazy
         :load="load"
+        default-expand-all
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <el-table-column prop="name" label="分类名称" width="300" />

+ 5 - 1
src/views/commercialEngineering/components/base.vue

@@ -230,7 +230,7 @@
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24" class="item">
-          <div class="label">详细地址</div>
+          <div class="label">详细地址*:</div>
           <div class="value">
             <el-input v-model="formData.address" placeholder="请填写" size="mini" clearable />
             <geographicalPosi v-if="module !== 'detail'" :form-data="formData" @selectPosi="handleSelectPosi" />
@@ -643,6 +643,7 @@ export default {
       this.formData.lnt = data.center[0]
       this.formData.lat = data.center[1]
       this.formData.positionAddress = data.name
+      this.formData.address = data.name
       var { province, city, district, township } = data.data.addressComponent
       const area = district
       const street = township
@@ -710,4 +711,7 @@ export default {
     text-align: center !important;
   }
 }
+::v-deep .el-upload-list__item-name{
+  width: 200px !important;
+}
 </style>