Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

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/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