feat(product): 移除进销存相关接口

src/api/product.js

@@ -9,56 +9,56 @@ import request from '@/utils/request'
 export function findAll() {
   return request({
     url: '/sale/manage/specsType/find-all',
-    method: 'get',
+    method: 'get'
   })
 }
 // 查询所有规格jxc
 export function findAllJxc() {
   return request({
     url: 'scm/manage/product-bas/find-all',
-    method: 'get',
+    method: 'get'
   })
 }
 // 产品属性枚举
 export function productType() {
   return request({
     url: '/system/pub/enums/get-product-attr-type',
-    method: 'get',
+    method: 'get'
   })
 }
 // 发货类型
 export function getShipping() {
   return request({
     url: '/system/pub/enums/get-shipping-channel',
-    method: 'get',
+    method: 'get'
   })
 }
 // 单位
 export function getUnit() {
   return request({
     url: '/system/pub/enums/get-unit',
-    method: 'get',
+    method: 'get'
   })
 }
 // 销售模式
 export function saleModel() {
   return request({
     url: 'system/pub/enums/sale-model',
-    method: 'get',
+    method: 'get'
   })
 }
 // 所属分类
 export function classifyAll() {
   return request({
     url: '/sale/manage/classify/find-all',
-    method: 'get',
+    method: 'get'
   })
 }
 // 运输方式
 export function transportType() {
   return request({
     url: '/system/pub/enums/manager-transport-type',
-    method: 'get',
+    method: 'get'
   })
 }
 // 产品新增
@@ -129,14 +129,14 @@ export function productListJxc(params) {
 export function productDel(id) {
   return request({
     url: '/sale/manage/product/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 删除产品jxc
 export function productDelJxc(id) {
   return request({
     url: 'scm/manage/product-bas/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 产品详情
@@ -215,7 +215,7 @@ export function classifyUpdate(data) {
 export function classifyDel(id) {
   return request({
     url: '/sale/manage/classify/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 规格类型列表
@@ -254,7 +254,7 @@ export function specsTypeUpdate(data) {
 export function specsTypeDel(id) {
   return request({
     url: '/sale/manage/specsType/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 导出产品分类
@@ -285,7 +285,7 @@ export function areaClassIfyList(params) {
 export function areaClassifyDel(id) {
   return request({
     url: '/sale/manage/area-classify/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 
@@ -325,7 +325,7 @@ export function getAreaClassify(params) {
 export function getEWaresPermissionTypeList() {
   return request({
     url: '/system/pub/enums/getEWaresPermissionTypeList',
-    method: 'get',
+    method: 'get'
   })
 }
 // 根据id查询商品规格
@@ -364,14 +364,14 @@ export function get_hierarchy_list(params) {
 export function presale_status() {
   return request({
     url: '/system/pub/enums/presale-status',
-    method: 'get',
+    method: 'get'
   })
 }
 // 查询供应方式
 export function supply_way() {
   return request({
     url: '/system/pub/enums/supply-way',
-    method: 'get',
+    method: 'get'
   })
 }
 // 标签分类
@@ -431,7 +431,7 @@ export function waresList(params) {
 export function waresDel(id) {
   return request({
     url: '/sale/manage/wares/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 商品新增
@@ -496,7 +496,7 @@ export function postageList(params) {
 export function postageDel(id) {
   return request({
     url: '/sale/manage/postage/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 计费方式
@@ -527,7 +527,7 @@ export function findAllArea(params) {
 export function orderType() {
   return request({
     url: '/system/pub/enums/special-area',
-    method: 'get',
+    method: 'get'
   })
 }
 
@@ -555,7 +555,7 @@ export function postageDetail(params) {
     params
   })
 }
-//获取产品编号
+// 获取产品编号
 export function getProductCode(params) {
   return request({
     url: '/sale/manage/product/create-product-code',
@@ -563,7 +563,7 @@ export function getProductCode(params) {
     params
   })
 }
-//获取产品编号
+// 获取产品编号
 export function getWaresCode(params) {
   return request({
     url: '/sale/manage/wares/create-wares-code',
@@ -571,7 +571,7 @@ export function getWaresCode(params) {
     params
   })
 }
-//获取最大排序
+// 获取最大排序
 export function getMaxSort(params) {
   return request({
     url: '/sale/manage/product/get-max-sort',
@@ -579,7 +579,7 @@ export function getMaxSort(params) {
     params
   })
 }
-//单位列表
+// 单位列表
 export function unitList(params) {
   return request({
     url: '/sale/manage/unit/list',
@@ -587,7 +587,7 @@ export function unitList(params) {
     params
   })
 }
-//单位新增
+// 单位新增
 export function unitSave(data) {
   return request({
     url: '/sale/manage/unit/save',
@@ -595,7 +595,7 @@ export function unitSave(data) {
     data
   })
 }
-//单位编辑
+// 单位编辑
 export function unitUpdate(data) {
   return request({
     url: '/sale/manage/unit/update',
@@ -603,7 +603,7 @@ export function unitUpdate(data) {
     data
   })
 }
-//单位详情
+// 单位详情
 export function unitDetail(params) {
   return request({
     url: '/sale/manage/unit/detail',
@@ -615,11 +615,11 @@ export function unitDetail(params) {
 export function unitDel(id) {
   return request({
     url: '/sale/manage/unit/' + id,
-    method: 'delete',
+    method: 'delete'
   })
 }
 
-//单位data
+// 单位data
 export function unitAll(params) {
   return request({
     url: '/sale/manage/unit/find-all',
@@ -741,14 +741,7 @@ export function productFind(params) {
     params
   })
 }
-// 产品基本信息1
+
-export function productFind1(params) {
-  return request({
-    url: 'scm/manage/product-bas/find-by-bas-all',
-    method: 'get',
-    params
-  })
-}
 // 供应商商品列表
 export function thProductList(params) {
   return request({

src/views/configManage/systemconfiguration/index.vue

@@ -220,6 +220,11 @@
               <el-input v-model="formd.sort" clearable />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="分享图片">
+              <imageUpload v-model="formd.sharePosterImage" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -236,6 +241,7 @@
 
 <script>
 import topBar from '@/components/topBar/checked.vue'
+import ImageUpload from '@/components/ImageUpload'
 import {
   getvertexList,
   deleteVertex,
@@ -249,10 +255,13 @@ import {
 import { updateVertexs } from '@/api/settle'
 import { getRouters } from '@/api/settle'
 import { topList } from './mixins'
+import { getToken } from '@/utils/auth'
+
 export default {
   name: 'Txpz',
   components: {
-    topBar
+    topBar,
+    ImageUpload
   },
   data() {
     return {
@@ -260,7 +269,8 @@ export default {
         vertexName: '', // 体系名称
         // memberCode: "", //体系编号
         memberCode: '', // 体系编号
-        regionVertexPkId: '' // 区域分组
+        regionVertexPkId: '', // 区域分组
+        sharePosterImage: '' // 分享图片
       },
       moren: 'txpz',
       topList: topList,
@@ -291,7 +301,12 @@ export default {
         ]
       },
       vertexList: [],
-      groupList: []
+      groupList: [],
+      uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
+      fileList: [],
+      headers: {
+        Authorization: getToken()
+      }
     }
   },
   created() {
@@ -301,6 +316,23 @@ export default {
     this.getUserRoute()
   },
   methods: {
+    handleUploadSuccess(res) {
+      if (res.code === 200) {
+        this.fileList.push(res.data)
+      } else {
+        this.$message({
+          type: 'error',
+          message: '上传失败'
+        })
+      }
+    },
+    removeFile(file, fileList) {
+      this.fileList.forEach((item, index) => {
+        if (file.uid === item.uid) {
+          this.fileList.splice(index, 1)
+        }
+      })
+    },
     getUserRoute() {
       getRouters().then((res) => {
         console.log(res.data, 'res.data', this.topList)

src/views/financial/onlinePayDetails/index.vue

@@ -6,228 +6,300 @@
 -->
 <template>
   <div class="page">
-    <topBar v-if="topList.length > 0"
+    <topBar
-            :topList="topList"
+      v-if="topList.length > 0"
-            :moren="moren"></topBar>
+      :top-list="topList"
+      :moren="moren"
+    />
     <div class="main">
-      <el-form ref="select"
+      <el-form
-               :model="select"
+        ref="select"
-               style="background-color: #fff"
+        :model="select"
-               label-width="100px">
+        style="background-color: #fff"
+        label-width="100px"
+      >
         <el-row>
           <!-- 一层 -->
           <el-col :span="4">
             <el-form-item :label="'会员编号'">
-              <el-input clearable
+              <el-input
-                        v-model="select.memberCode"></el-input>
+                v-model="select.memberCode"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'会员姓名'">
-              <el-input clearable
+              <el-input
-                        v-model="select.memberName"></el-input>
+                v-model="select.memberName"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'交易金额'">
-              <el-input clearable
+              <el-input
-                        v-model="select.businessMoney"></el-input>
+                v-model="select.businessMoney"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'交易类型'">
-              <el-select clearable
+              <el-select
-                         :placeholder="'请选择'"
+                v-model="select.businessType"
-                         v-model="select.businessType">
+                clearable
-                <el-option v-for="item in tradeTypeList"
+                :placeholder="'请选择'"
-                           :key="item.value"
+              >
-                           :label="item.label"
+                <el-option
-                           :value="item.value"></el-option>
+                  v-for="item in tradeTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="订单类型">
+              <el-select
+                v-model="select.orderType"
+                clearable
+                :placeholder="'请选择'"
+              >
+                <el-option
+                  v-for="item in orderTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'支付渠道'">
-              <el-select clearable
+              <el-select
-                         :placeholder="'请选择'"
+                v-model="select.payChannel"
-                         v-model="select.payChannel">
+                clearable
-                <el-option v-for="item in channelList"
+                :placeholder="'请选择'"
-                           :key="item.value"
+              >
-                           :label="item.label"
+                <el-option
-                           :value="item.value"></el-option>
+                  v-for="item in channelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'支付方式'">
-              <el-select clearable
+              <el-select
-                         :placeholder="'请选择'"
+                v-model="select.payType"
-                         v-model="select.payType">
+                clearable
-                <el-option v-for="item in peyTypeList"
+                :placeholder="'请选择'"
-                           :key="item.value"
+              >
-                           :label="item.label"
+                <el-option
-                           :value="item.value"></el-option>
+                  v-for="item in peyTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'支付状态'">
-              <el-select clearable
+              <el-select
-                         :placeholder="'请选择'"
+                v-model="select.payStatus"
-                         v-model="select.payStatus">
+                clearable
-                <el-option v-for="item in statusList"
+                :placeholder="'请选择'"
-                           :key="item.value"
+              >
-                           :label="item.label"
+                <el-option
-                           :value="item.value"></el-option>
+                  v-for="item in statusList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'单据编号'">
-              <el-input clearable
+              <el-input
-                        v-model="select.businessCode"></el-input>
+                v-model="select.businessCode"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="'下单日期'">
-              <el-date-picker v-model="select.creationTime"
+              <el-date-picker
-                              value-format="yyyy-MM-dd"
+                v-model="select.creationTime"
-                              type="daterange"
+                value-format="yyyy-MM-dd"
-                              :range-separator="'至'"
+                type="daterange"
-                              :start-placeholder="'开始日期'"
+                :range-separator="'至'"
-                              :end-placeholder="'结束日期'">
+                :start-placeholder="'开始日期'"
-              </el-date-picker>
+                :end-placeholder="'结束日期'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="'支付日期'">
-              <el-date-picker v-model="select.payTime"
+              <el-date-picker
-                              @change="changeTime1"
+                v-model="select.payTime"
-                              value-format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
-                              type="daterange"
+                type="daterange"
-                              :range-separator="'至'"
+                :range-separator="'至'"
-                              :start-placeholder="'开始日期'"
+                :start-placeholder="'开始日期'"
-                              :end-placeholder="'结束日期'">
+                :end-placeholder="'结束日期'"
-              </el-date-picker>
+                @change="changeTime1"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-button class="my_search"
+            <el-button
-                       style="margin-left: 30px"
+              class="my_search"
-                       @click="getDataList"> {{ '搜索' }}</el-button>
+              style="margin-left: 30px"
+              @click="getDataList"
+            > {{ '搜索' }}</el-button>
             <el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button>
           </el-col>
         </el-row>
       </el-form>
       <div class="maintop">
         <div class="mainbtn">
-          <el-button size="small"
+          <el-button
-                     @click="handleExport"
+            v-has-buttons="['OnlinePayDetailsExport']"
-                     v-has-buttons="['OnlinePayDetailsExport']"
+            size="small"
-                     class="thebtn2"> {{ '导出' }}</el-button>
+            class="thebtn2"
+            @click="handleExport"
+          > {{ '导出' }}</el-button>
         </div>
       </div>
       <div class="maintable">
-        <el-table :data="tableData"
+        <el-table
-                  height="640px"
+          :data="tableData"
-                  style="width: 100%"
+          height="640px"
-                  :header-cell-style="{ background: '#EEEEEE' }"
+          style="width: 100%"
-                  :row-class-name="tableRowClassName"
+          :header-cell-style="{ background: '#EEEEEE' }"
-                  @selection-change="handleSelectionChange">
+          :row-class-name="tableRowClassName"
-          <el-table-column type="selection"
+          @selection-change="handleSelectionChange"
-                           width="55"> </el-table-column>
+        >
-<!--          <el-table-column align="center"-->
+          <el-table-column
-<!--                           prop="title"-->
+            type="selection"
-<!--                           :label="'国家'">-->
+            width="55"
-<!--            <template slot-scope="scope">-->
+          />
-<!--              <div class="tem">-->
+          <!--          <el-table-column align="center"-->
-<!--                <img :src="scope.row.pkCountryIcon"-->
+          <!--                           prop="title"-->
-<!--                     alt="" />-->
+          <!--                           :label="'国家'">-->
-<!--                &lt;!&ndash; <div>{{ scope.row.pkCountryName }}</div> &ndash;&gt;-->
+          <!--            <template slot-scope="scope">-->
-<!--              </div>-->
+          <!--              <div class="tem">-->
-<!--            </template>-->
+          <!--                <img :src="scope.row.pkCountryIcon"-->
-<!--          </el-table-column>-->
+          <!--                     alt="" />-->
-          <el-table-column align="center"
+          <!--                &lt;!&ndash; <div>{{ scope.row.pkCountryName }}</div> &ndash;&gt;-->
-                           prop="memberCode"
+          <!--              </div>-->
-                           :label="'会员编号'"
+          <!--            </template>-->
-                           width="140">
+          <!--          </el-table-column>-->
-          </el-table-column>
+          <el-table-column
-          <el-table-column align="center"
+            align="center"
-                           prop="memberName"
+            prop="memberCode"
-                           :label="'会员姓名'">
+            :label="'会员编号'"
-          </el-table-column>
+            width="140"
-          <el-table-column align="center"
+          />
-                           prop="phone"
+          <el-table-column
-                           label="联系方式"
+            align="center"
-                           width="140">
+            prop="memberName"
-          </el-table-column>
+            :label="'会员姓名'"
-          <el-table-column align="center"
+          />
-                           prop="businessTypeVal"
+          <el-table-column
-                           :label="'交易类型'">
+            align="center"
-          </el-table-column>
+            prop="phone"
-          <el-table-column align="center"
+            label="联系方式"
-                           prop="businessMoney"
+            width="140"
-                           :formatter="stateFormat"
+          />
-                            :label="'交易金额'+`(${isLocalSymbol()})`"
+          <el-table-column
-                           width="150">
+            align="center"
-          </el-table-column>
+            prop="businessTypeVal"
-          <el-table-column align="center"
+            :label="'交易类型'"
-                           prop="payMoney"
+          />
-                           :formatter="stateFormat"
+          <el-table-column
-                           label="实际支付金额(¥)"
+            align="center"
-                           width="150">
+            prop="orderTypeVal"
-          </el-table-column>
+            label="订单类型"
-          <!-- <el-table-column align="center"
+          />
-                           prop="payMoney"
+          <el-table-column
-                           :formatter="stateFormat"
+            align="center"
-                            :label="'交易金额'+`(${isLocals()})`" width="150">
+            prop="businessMoney"
-          </el-table-column>
+            :formatter="stateFormat"
-          <el-table-column align="center"
+            :label="'交易金额'"
-                           :formatter="stateFormat"
+            width="150"
-                           prop="settleTradeBalance"
+          />
-                           label="实际支付金额($)" width="150">
+          <el-table-column
-          </el-table-column>
+            align="center"
-          <el-table-column align="center"
+            prop="payMoney"
-                           prop="exchangeRate"
+            :formatter="stateFormat"
-                            :label="'汇率'">
+            label="实际支付金额"
-          </el-table-column> -->
+            width="150"
+          />
 
-          <el-table-column align="center"
+          <el-table-column
-                           prop="payChannelVal"
+            align="center"
-                           :label="'支付渠道'">
+            prop="payChannelVal"
-          </el-table-column>
+            :label="'支付渠道'"
-          <el-table-column align="center"
+          />
-                           prop="payTypeVal"
+          <el-table-column
-                           :label="'支付方式'">
+            align="center"
-          </el-table-column>
+            prop="payTypeVal"
-          <el-table-column align="center"
+            :label="'支付方式'"
-                           prop="payStatusVal"
+          />
-                           :label="'支付状态'">
+          <el-table-column
-          </el-table-column>
+            align="center"
-          <el-table-column align="center"
+            prop="payStatusVal"
-                           prop="creationTime"
+            :label="'支付状态'"
-                           :label="'下单日期'"
+          />
-                           width="180">
+          <el-table-column
-          </el-table-column>
+            align="center"
-          <el-table-column align="center"
+            prop="creationTime"
-                           prop="payTime"
+            :label="'下单日期'"
-                           :label="'支付日期'"
+            width="180"
-                           width="180">
+          />
-          </el-table-column>
+          <el-table-column
-          <el-table-column align="center"
+            align="center"
-                           prop="businessCode"
+            prop="payTime"
-                           min-width="180px"
+            :label="'支付日期'"
-                           :label="'单据编号'">
+            width="180"
-          </el-table-column>
+          />
-          <el-table-column align="center"
+          <el-table-column
-                           prop="time"
+            align="center"
-                           :label="'操作'"
+            prop="businessCode"
-                           fixed="right">
+            :label="'单据编号'"
+          />
+          <el-table-column
+            align="center"
+            prop="mainAccountMoney"
+            label="主账户金额"
+            width="150"
+          />
+          <el-table-column
+            align="center"
+            prop="subAccountMoney"
+            label="子账户金额"
+            width="150"
+          />
+          <el-table-column
+            align="center"
+            prop="time"
+            :label="'操作'"
+            fixed="right"
+          >
             <template slot-scope="scope">
-              <el-button @click="toFixed(scope.row.pkId)"
+              <el-button
-                         style="color: #ffad41"
+                style="color: #ffad41"
-                         type="text"
+                type="text"
-                         size="small">
+                size="small"
+                @click="toFixed(scope.row.pkId)"
+              >
                 {{ '导出' }}
               </el-button>
             </template>
@@ -235,11 +307,13 @@
         </el-table>
       </div>
     </div>
-    <pagination v-show="total>0"
+    <pagination
-                :total="total"
+      v-show="total>0"
-                :page.sync="queryParams.pageNum"
+      :total="total"
-                :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
-                @pagination="getDataList" />
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
   </div>
 </template>
 
@@ -251,25 +325,27 @@ import { userCountryList } from '@/api/user'
 export default {
   name: 'Bzpz',
   components: {
-    topBar,
+    topBar
   },
   filters: {
-     isAgree(val) {
+    isAgree(val) {
       if (!val) {
-        return '允许';
+        return '允许'
       } else {
-        return '禁止';
+        return '禁止'
       }
-    },
+    }
   },
   data() {
     return {
       creationTime: [],
-      select: {},
+      select: {
+        orderType: ''
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
       dialogVisible: false,
@@ -280,26 +356,48 @@ export default {
       peyTypeList: [
         {
           value: '1',
-          label: '支付宝',
+          label: '支付宝'
         },
         {
           value: '2',
-          label: '微信',
+          label: '微信'
         },
         {
           value: '3',
-          label: '银行卡',
+          label: '银行卡'
+        }
+      ],
+      orderTypeList: [
+        {
+          value: '-1',
+          label: '充值订单'
         },
+        {
+          value: '1',
+          label: '注册订单'
+        },
+        {
+          value: '2',
+          label: '升级订单'
+        },
+        {
+          value: '3',
+          label: '复购订单'
+        },
+        {
+          value: '10',
+          label: '重消订单'
+        }
       ],
       tradeTypeList: [],
       moren: 'onlinePayDetails',
       topList: [
         {
           name: '在线支付明细',
-          path: 'onlinePayDetails',
+          path: 'onlinePayDetails'
-        },
+        }
       ],
-      countryList: [],
+      countryList: []
     }
   },
   mounted() {
@@ -329,7 +427,7 @@ export default {
       // this.select.startDate = val[0]
       // this.select.endDate = val[1]
     },
-    reset(){
+    reset() {
       this.select = {}
       this.getDataList()
     },
@@ -359,10 +457,10 @@ export default {
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
     handleExport() {
-      this.$confirm( '是否确认导出所有数据项?', '警告', {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       }).then((_) => {
         this.download(
           '/pay/manage/online-payment/export',
@@ -378,8 +476,8 @@ export default {
         return 'success-row'
       }
       return ''
-    },
+    }
-  },
+  }
 }
 </script>
 <style scoped lang="scss">

src/views/goodsManage/productRelease/jcsz.vue

@@ -366,70 +366,7 @@
           {{ '确认' }}</el-button>
       </div>
     </div>
-    <!-- 产品弹框 -->
+
-    <el-dialog
-      :title="'添加'"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      width="50%"
-      center
-      :before-close="handleClose1"
-    >
-      <div class="cpHeight">
-        <el-row>
-          <el-col :span="22">
-            <el-input
-              v-model="select.query"
-              clearable
-              :placeholder="'请输入'"
-              prefix-icon="el-icon-search"
-              @keyup.enter.native="getProduct"
-            />
-          </el-col>
-          <el-col :span="2">
-            <el-button type="primary" size="small" @click="getProduct">
-              {{ '搜索' }}</el-button>
-          </el-col>
-        </el-row>
-        <div style="height: 10px" />
-        <el-table
-          ref="multipleTable"
-          :data="productList"
-          height="500px"
-          style="width: 100%"
-          :header-cell-style="{ background: '#EEEEEE' }"
-          :row-class-name="tableRowClassName"
-          @select-all="onSelectAll"
-          @select="selected"
-        >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'产品名称'"
-          />
-          <el-table-column
-            align="center"
-            prop="productCode"
-            :label="'产品编号'"
-          />
-          <el-table-column align="center" prop="unitStr" :label="'单位'" />
-        </el-table>
-      </div>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getProduct"
-      />
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose1">{{ '取消' }}</el-button>
-        <el-button type="primary" @click="sureProduct">{{
-          '确认'
-        }}</el-button>
-      </span>
-    </el-dialog>
     <!-- 规格 -->
     <el-dialog
       :title="'添加'"
@@ -659,7 +596,7 @@ export default {
     // 获取排序
     this.getSort()
     // 获取产品
-    this.getProduct()
+    // this.getProduct()
   },
   methods: {
     sureProduct() {
@@ -682,12 +619,7 @@ export default {
     opProduct() {
       this.dialogVisible = true
     },
-    getProduct() {
+
-      api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
-        this.productList = res.rows
-        this.total = res.total
-      })
-    },
     getRepurchaseType() {
       api.repurchaseType().then((res) => {
         this.repurchaseTypeList = res.data

src/views/goodsManage/productRelease/productDetail.vue

@@ -519,70 +519,7 @@
         > {{ '确认' }}</el-button>
       </div>
     </div>
-    <!-- 产品弹框 -->
+
-    <el-dialog
-      :title="'添加'"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      width="50%"
-      center
-      :before-close="handleClose1"
-    >
-      <div class="cpHeight">
-        <el-row>
-          <el-col :span="22">
-            <el-input
-              v-model="select.query"
-              clearable
-              :placeholder="'请输入'"
-              prefix-icon="el-icon-search"
-              @keyup.enter.native="getProduct"
-            />
-          </el-col>
-          <el-col :span="2">
-            <el-button type="primary" size="small" @click="getProduct">
-              {{ '搜索' }}</el-button>
-          </el-col>
-        </el-row>
-        <div style="height: 10px" />
-        <el-table
-          ref="multipleTable"
-          :data="productList"
-          height="500px"
-          style="width: 100%"
-          :header-cell-style="{ background: '#EEEEEE' }"
-          :row-class-name="tableRowClassName"
-          @select-all="onSelectAll"
-          @select="selected"
-        >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'产品名称'"
-          />
-          <el-table-column
-            align="center"
-            prop="productCode"
-            :label="'产品编号'"
-          />
-          <el-table-column align="center" prop="unitStr" :label="'单位'" />
-        </el-table>
-      </div>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getProduct"
-      />
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose1">{{ '取消' }}</el-button>
-        <el-button type="primary" @click="sureProduct">{{
-          '确认'
-        }}</el-button>
-      </span>
-    </el-dialog>
     <!-- 规格 -->
     <el-dialog
       :title="'添加'"
@@ -824,7 +761,6 @@ export default {
     this.getTransportType()
     // 复购类型
     this.getRepurchaseType()
-    this.getProduct()
   },
   methods: {
     sureProduct() {
@@ -844,15 +780,7 @@ export default {
     handleClose1() {
       this.dialogVisible = false
     },
-    opProduct() {
+
-      this.dialogVisible = true
-    },
-    getProduct() {
-      api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
-        this.productList = res.rows
-        this.total = res.total
-      })
-    },
     getRepurchaseType() {
       api.repurchaseType().then((res) => {
         this.repurchaseTypeList = res.data