From 29a69157716b904fd39d95f8ca53b037aa7ade60 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Sun, 8 Jun 2025 17:00:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(feedback):=20=E7=A7=BB=E9=99=A4=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E5=8F=8D=E9=A6=88=EF=BC=8C=20=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8F=8A=E7=BC=96=E8=BE=91=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=93=E5=82=A8=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/notice.js                             |  33 -
 src/router/index.js                           |  13 -
 src/views/announcement/feedback/detail.vue    | 163 ----
 src/views/announcement/feedback/index.vue     | 496 ----------
 src/views/goodsManage/productRelease/jcsz.vue | 449 +++++----
 .../productRelease/productDetail.vue          | 868 ++++++++++--------
 6 files changed, 719 insertions(+), 1303 deletions(-)
 delete mode 100644 src/views/announcement/feedback/detail.vue
 delete mode 100644 src/views/announcement/feedback/index.vue

diff --git a/src/api/notice.js b/src/api/notice.js
index 8470071..b8668d5 100644
--- a/src/api/notice.js
+++ b/src/api/notice.js
@@ -457,32 +457,7 @@ export function noticeSaveAdmin(data) {
     data
   })
 }
-// 意见反馈列表
-export function feedbackList(data) {
-  return request({
-    url: '/system/manage/feedback/list?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
-    method: 'post',
-    data
-  })
-}
 
-// 意见反馈查看详情
-export function delFeedShow(params) {
-  return request({
-    url: '/system/manage/feedback/show',
-    method: 'get',
-    params
-  })
-}
-
-// 意见反馈删除
-export function delFeed(params) {
-  return request({
-    url: '/system/manage/feedback/delete',
-    method: 'get',
-    params
-  })
-}
 // 公告删除
 export function noticeDelete(params) {
   return request({
@@ -593,14 +568,6 @@ export function getNoticeBusinessType(params) {
   })
 }
 
-// 意见反馈
-export function saveFeedback(data) {
-  return request({
-    url: '/system/manage/feedback/save',
-    method: 'post',
-    data
-  })
-}
 // 公告上移
 export function upMove(params) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index f6a08a0..e9d9039 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1224,12 +1224,6 @@ export const constantRoutes = [
         meta: { title: '后台公告' },
         hidden: true
       },
-      {
-        path: 'feedback',
-        name: 'Feedback',
-        component: () => import('@/views/announcement/feedback/index'),
-        meta: { title: '意见反馈' }
-      },
       {
         path: 'noticeList/details',
         name: 'NoticeDetails',
@@ -1245,13 +1239,6 @@ export const constantRoutes = [
         hidden: true
       },
 
-      {
-        path: 'feedback/detail',
-        name: 'feedbackDetail',
-        component: () => import('@/views/announcement/feedback/detail'),
-        meta: { title: '意见反馈' },
-        hidden: true
-      },
       // {
       //   path: 'releaseAnnouncement',
       //   name: 'ReleaseAnnouncement',
diff --git a/src/views/announcement/feedback/detail.vue b/src/views/announcement/feedback/detail.vue
deleted file mode 100644
index 9e431fc..0000000
--- a/src/views/announcement/feedback/detail.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2023-02-23 15:59:57
--->
-<template>
-  <div class="page">
-    <div class="main">
-      <el-form
-        :model="ruleForm"
-        :rules="rules"
-        ref="ruleForm"
-        label-width="100px"
-        class="demo-ruleForm"
-      >
-        <el-row>
-          <el-col :span="6">
-            <el-form-item :label="'类型'" prop="name">
-              <el-input v-model="ruleForm.typeVal" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="22">
-            <el-form-item :label="'内容'">
-              <editor
-                ref="sptwEditor"
-                :readOnly="true"
-                v-model="ruleForm.idea"
-                :min-height="196"
-                :uploadUrl="uploadImgUrl"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row
-          v-for="(item, index) in ruleForm.feedbackReplyList"
-          :key="index"
-        >
-          <el-col :span="22">
-            <el-form-item :label="'回复意见'">
-              <editor
-                :readOnly="true"
-                v-model="item.replyContent"
-                :min-height="196"
-                :uploadUrl="uploadImgUrl"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="22">
-            <el-form-item :label="'回复意见'">
-              <editor
-                v-model="replyContent"
-                :min-height="196"
-                :uploadUrl="uploadImgUrl"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="footer">
-      <el-button size="small" @click="goBack" class="thebtn2"> {{ '取消' }}</el-button>
-      <el-button size="small" @click="saveData" class="thebtn1"  v-has-buttons="['feedbackConfirm']"> {{ '确认' }}</el-button>
-    </div>
-  </div>
-</template>
-
-  <script>
-import Editor from "@/components/Editor";
-import * as api from "@/api/notice.js";
-export default {
-  components: {
-    Editor,
-  },
-  data() {
-    return {
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/upload",
-      ruleForm: {},
-      rules: {},
-      typeList: [],
-      iffind: "",
-      replyContent: "",
-    };
-  },
-  mounted() {
-    this.pkId = this.$route.query.pkId || "";
-    this.iffind = this.$route.query.index || "";
-    this.getData();
-  },
-  methods: {
-    getData() {
-      api.delFeedShow({ pkId: this.pkId }).then((res) => {
-        this.ruleForm = res.data;
-      });
-    },
-    goBack() {
-      this.$router.go(-1);
-    },
-    saveData() {
-      if (this.iffind == 2) {
-        //可填写意见
-        api
-          .saveFeedback({
-            pkFeedbackId: this.pkId,
-            replyContent: this.replyContent,
-          })
-          .then((res) => {
-            if (res.code == 200) {
-              this.$message({
-                type: "success",
-                message: res.msg,
-              });
-              this.$router.go(-1);
-            }
-          });
-      } else {
-        this.$router.go(-1);
-      }
-    },
-  },
-};
-</script>
-
-  <style lang="scss" scoped>
-.page {
-  padding: 20px;
-  background: #f9f9f9;
-  font-size: 14px;
-  .main {
-    background: #ffffff;
-    border-radius: 8px;
-    box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-    padding: 20px 10px;
-  }
-  ::v-deep .el-select {
-    width: 100%;
-  }
-}
-.footer {
-  height: 68px;
-  background: #ffffff;
-  box-shadow: 0px -3px 20px 0px rgba(204, 204, 204, 0.5);
-  // margin: 0 20px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  .thebtn1 {
-    background: #3181e5;
-    color: #ffffff;
-    padding: 9px 45px;
-  }
-  .thebtn2 {
-    background: #cccccc;
-    color: #ffffff;
-    padding: 9px 45px;
-  }
-}
-</style>
diff --git a/src/views/announcement/feedback/index.vue b/src/views/announcement/feedback/index.vue
deleted file mode 100644
index a52f49f..0000000
--- a/src/views/announcement/feedback/index.vue
+++ /dev/null
@@ -1,496 +0,0 @@
-<template>
-  <div class="page">
-    <topBar
-      v-if="topList.length > 0"
-      :topList="topList"
-      :moren="moren"
-    ></topBar>
-    <div class="thetopbox">
-      <el-form ref="select" :model="select" label-width="80px">
-        <el-row>
-          <el-col :span="4">
-            <el-form-item :label="'会员编号'">
-              <el-input clearable v-model="select.memberCode"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'会员姓名'">
-              <el-input clearable v-model="select.memberName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'类型'">
-              <el-select
-                clearable
-                :placeholder="'请选择'"
-                v-model="select.type"
-              >
-                <el-option
-                  v-for="item in webList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'隶属体系'">
-              <el-select v-model="queryParams.pkVertex" clearable placeholder="">
-                <el-option
-                  v-for="item in vertexList"
-                  :key="item.value"
-                  :label="item.vertexName"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-         
-          <el-col :span="8">
-            <el-form-item :label="'填写日期'">
-              <el-date-picker
-                v-model="creationTime"
-                type="daterange"
-                @change="changeTime"
-                :range-separator="'至'"
-                :start-placeholder="'开始日期'"
-                :end-placeholder="'结束日期'"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'隶属团队'">
-              <el-select v-model="queryParams.pkTeamCode" clearable placeholder="">
-                <el-option
-                  v-for="item in memberteamList"
-                  :key="item.value"
-                  :label="item.teamName"
-                  :value="item.pkId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" style="margin-left: 20px;">
-            <el-button class="searchbtn" @click="getDataList">
-              {{ '搜索' }}</el-button
-            >
-            <el-button @click="reset"> {{ '重置' }}</el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="maintop">
-      <div class="mainbtn">
-        <el-button
-          size="small"
-          class="thebtn2"
-          @click="handleExport"
-          v-has-buttons="['feedbackExport']"
-        >
-          {{ '导出' }}</el-button
-        >
-      </div>
-    </div>
-    <div class="main">
-      <div class="maintable">
-        <el-table
-          :data="tableData"
-          v-loading="loading"
-          style="width: 100%"
-          height="680px"
-          :header-cell-style="{ background: '#EEEEEE' }"
-          :row-class-name="tableRowClassName"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <el-table-column align="center" type="index" :label="'序号'">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="memberCode"
-            :label="'会员编号'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="memberName"
-            :label="'会员姓名'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="teamName"
-            :label="'隶属团队'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="vertexName"
-            :label="'隶属体系'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="typeVal" :label="'类型'">
-          </el-table-column>
-          <el-table-column align="center" prop="idea" :label="'个人意见'">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="statusVal"
-            :label="'反馈状态'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="creationTime"
-            :label="'填写日期'"
-          >
-          </el-table-column>
-
-          <el-table-column
-            align="center"
-            prop="time"
-            :label="'操作'"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              <el-button
-                @click="toFixed(scope.row.pkId, 2)"
-                type="text"
-                size="small"
-                style="color: #009b58"
-                v-has-buttons="['feebf']"
-              >
-                {{ '反馈' }}
-              </el-button>
-              <el-button
-                @click="toFixed(scope.row.pkId, 1)"
-                type="text"
-                size="small"
-                v-has-buttons="['feebSee']"
-                style="color: #4391fd"
-              >
-                {{ '查看' }}
-              </el-button>
-              <!-- <el-button @click="handleDelete(scope.row.pkId)"
-                         type="text"
-                         size="small"
-                         style="color: #c73030">
-                删除
-              </el-button> -->
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getDataList"
-    />
-  </div>
-</template>
-
-<script>
-import topBar from "@/components/topBar";
-import * as api from "@/api/notice.js";
-import { getvertexValue, getmemberTeamList } from "@/api/member";
-export default {
-  name: "Bzpz",
-  components: {
-    topBar,
-  },
-  filters: {
-    isAgree(val) {
-      if (!val) {
-        return '允许';
-      } else {
-        return '禁止';
-      }
-    },
-  },
-  data() {
-    return {
-      moren: "/announcement/feedback",
-      topList: [
-        {
-          name: '意见反馈',
-          path: "/announcement/feedback",
-        },
-      ],
-      typeList: [
-        {
-          value: 0,
-          label: '前台',
-        },
-        {
-          value: 1,
-          label: '后台',
-        },
-      ],
-      digList: [
-        {
-          value: 0,
-          label: '允许',
-        },
-        {
-          value: 1,
-          label: '禁止',
-        },
-      ],
-      creationTime: [],
-      select: {},
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 50,
-      },
-      addOrEdit: "",
-      total: 0,
-      dialogVisible: false,
-      loading:false,
-      tableData: [],
-      form: {
-        name: "",
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入规格类型', trigger: "blur" },
-        ],
-      },
-      webList: [],
-      localList: [],
-      popList: [],
-      gradeList: [],
-      stateList: [],
-      vertexList: [], // 隶属体系
-      memberteamList: [], // 隶属团队
-    };
-  },
-  mounted() {
-    // 获取下拉
-    this.getData();
-    // 获取列表
-    this.getDataList();
-  },
-  methods: {
-    reset() {
-      this.select = {};
-      this.creationTime = [];
-      this.getDataList();
-    },
-    getData() {
-      api.noticeWebsite().then((res) => {
-        this.webList = res.data;
-      });
-      api.noticeLocation().then((res) => {
-        this.localList = res.data;
-      });
-      api.noticePopup().then((res) => {
-        this.popList = res.data;
-      });
-      api.noticeGrade().then((res) => {
-        this.gradeList = res.data;
-      });
-      api.noticeState().then((res) => {
-        this.stateList = res.data;
-      });
-      getmemberTeamList().then((res) => {
-        this.memberteamList = res.rows;
-      });
-      getvertexValue().then((res) => {
-        this.vertexList = res.data;
-      });
-    },
-    changeTime(val) {
-      this.select.startDate = val[0];
-      this.select.endDate = val[1];
-    },
-
-    // 点击查看1/反馈2
-    toFixed(id, index) {
-      this.addOrEdit = false;
-      this.dialogVisible = true;
-      this.$router.push({
-        path: "feedback/detail",
-        query: {
-          pkId: id,
-          index: index,
-        },
-      });
-    },
-    // 删除
-    handleDelete(id) {
-      this.$confirm('确认删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: "warning",
-      }).then(() => {
-        api.delFeed(id).then((res) => {
-          this.getDataList();
-        });
-      });
-    },
-
-    openDig() {
-      this.$router.push({
-        path: "noticeList/details",
-      });
-    },
-    getDataList() {
-      this.loading = true
-      api
-        .feedbackList(Object.assign({}, this.queryParams, this.select))
-        .then((res) => {
-          this.loading = false
-          this.tableData = res.rows;
-          this.total = res.total;
-        });
-    },
-    handleSelectionChange(val) {},
-    /** 导出按钮操作 */
-    handleExport() {
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: "warning",
-      }).then((_) => {
-        this.download(
-          "/system/manage/feedback/export",
-          Object.assign({}, this.queryParams, this.select),
-          `意见反馈-${new Date().getTime()}.xlsx`
-        );
-      });
-    },
-    tableRowClassName({ row, rowIndex }) {
-      if (rowIndex % 2 == 1) {
-        return "warning-row";
-      } else if (rowIndex % 2 == 0) {
-        return "success-row";
-      }
-      return "";
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-::v-deep .el-table .warning-row {
-  background: #f9f9f9;
-}
-
-::v-deep .el-table .success-row {
-  background: #ffffff;
-}
-::v-deep .el-table thead {
-  color: #000000;
-}
-::v-deep .el-select {
-  width: 100%;
-}
-.uploadIcon ::v-deep .el-upload--picture-card {
-  display: none !important; /* 上传按钮隐藏 */
-}
-.searchbtn {
-  background: #c8161d;
-  color: #ffffff;
-}
-.page {
-  padding: 10px 20px;
-  background: #f9f9f9;
-  font-size: 14px;
-  .thetopbox {
-    padding: 10px 0;
-    background: #ffffff;
-    border-radius: 8px;
-    .searchbox {
-      display: flex;
-      align-items: center;
-      .searchtitle {
-        margin-right: 10px;
-      }
-      .searchbtn {
-        width: 68px;
-        background: #c8161d;
-        color: #ffffff;
-      }
-    }
-  }
-  .maintop {
-    display: flex;
-    // padding: 10px 0;
-    justify-content: space-between;
-    align-items: center;
-    .mainbtn {
-      display: flex;
-      justify-content: space-between;
-      align-content: center;
-      width: 100%;
-
-      .thebtn2 {
-        color: #ffffff;
-        background: #ffad41;
-      }
-    }
-  }
-  .main {
-    background: #ffffff;
-    border-radius: 8px;
-    box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-    // padding: 20px;
-    .maintop {
-      display: flex;
-      // padding: 10px 20px;
-      justify-content: space-between;
-      align-items: center;
-      .mainbtn {
-        .thebtn1 {
-          background: #3181e5;
-          color: #ffffff;
-        }
-        .thebtn2 {
-          background: #ffad41;
-          color: #ffffff;
-        }
-      }
-      .maintitle {
-        font-size: 10px;
-        font-family: MicrosoftYaHei;
-        color: #999999;
-      }
-    }
-  }
-  .tem {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    img {
-      width: 28px;
-      height: 20px;
-      margin-right: 3px;
-    }
-  }
-  .isRed {
-    color: #ed1d25;
-  }
-  .isGreen {
-    color: #1ab62b;
-  }
-  .bgImg {
-    width: 48px;
-    height: 48px;
-  }
-}
-.openClose {
-  text-align: right;
-  margin-right: 10px;
-  color: #3181e5;
-}
-::v-deep .el-date-editor.el-input,
-.el-date-editor.el-input__inner {
-  width: auto;
-}
-</style>
diff --git a/src/views/goodsManage/productRelease/jcsz.vue b/src/views/goodsManage/productRelease/jcsz.vue
index 106dfe1..e43b27d 100644
--- a/src/views/goodsManage/productRelease/jcsz.vue
+++ b/src/views/goodsManage/productRelease/jcsz.vue
@@ -8,10 +8,10 @@
   <div class="page">
     <div class="topbox">
       <div
-        class="levelList_i"
-        :class="tabActive == item.id ? 'act' : ''"
         v-for="(item, index) in topList"
         :key="index"
+        class="levelList_i"
+        :class="tabActive == item.id ? 'act' : ''"
         @click.prevent="handleLink(item.id)"
       >
         {{ item.name }}
@@ -25,49 +25,49 @@
               <el-col class="el-col-40">
                 <el-form-item :label="'产品名称'" prop="productName">
                   <el-input
-                    clearable
                     v-model="form.productName"
+                    clearable
                     :placeholder="'请输入'"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'产品编码'" prop="productCode">
                   <el-input
-                    clearable
                     v-model="form.productCode"
+                    clearable
                     :placeholder="'请输入'"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'划线价'" prop="retailPrice">
                   <el-input
+                    v-model="form.retailPrice"
                     clearable
                     oninput="value=value.replace(/[^\d.]/g,'')"
-                    v-model="form.retailPrice"
                     :placeholder="'请输入'"
-                  ></el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'发货类型'" prop="shippingChannel">
-                  <el-select clearable v-model="form.shippingChannel">
+                  <el-select v-model="form.shippingChannel" clearable>
                     <el-option
                       v-for="item in fhTypeList"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'保质期'" prop="shelfLife">
                   <el-input
+                    v-model="form.shelfLife"
                     clearable
                     oninput="value=value.replace(/[^\d]/g,'')"
-                    v-model="form.shelfLife"
                     :placeholder="'请输入'"
                   >
                     <i slot="suffix" class="neibu">{{ '天' }} </i>
@@ -76,22 +76,22 @@
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'单位'" prop="unit">
-                  <el-select clearable v-model="form.unit">
+                  <el-select v-model="form.unit" clearable>
                     <el-option
                       v-for="item in dwList"
                       :key="item.pkId"
                       :label="item.name"
                       :value="item.pkId"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'重量'" prop="weight">
                   <el-input
+                    v-model="form.weight"
                     clearable
                     oninput="value=value.replace(/[^\d.]/g,'')"
-                    v-model="form.weight"
                     :placeholder="'请输入'"
                   >
                     <i slot="suffix" class="neibu">KG </i>
@@ -101,9 +101,9 @@
               <el-col class="el-col-20">
                 <el-form-item :label="'邮费重量'" prop="postageWeight">
                   <el-input
+                    v-model="form.postageWeight"
                     clearable
                     oninput="value=value.replace(/[^\d.]/g,'')"
-                    v-model="form.postageWeight"
                     :placeholder="'请输入'"
                   >
                     <i slot="suffix" class="neibu">KG </i>
@@ -112,45 +112,44 @@
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'产品属性'" prop="productAttr">
-                  <el-select clearable v-model="form.productAttr">
+                  <el-select v-model="form.productAttr" clearable>
                     <el-option
                       v-for="item in productTypeList"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'所属分类'" prop="pkClassify">
-                  <el-select clearable v-model="form.pkClassify">
+                  <el-select v-model="form.pkClassify" clearable>
                     <el-option
                       v-for="item in classifyList"
                       :key="item.pkId"
                       :label="item.name"
                       :value="item.pkId"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'排列序号'" prop="sort">
                   <el-input
+                    v-model="form.sort"
                     clearable
                     oninput="value = value.replace(/[^\d]/g,'')"
-                    v-model="form.sort"
                     :placeholder="'请输入'"
-                  >
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'长'" prop="length">
                   <el-input
+                    v-model="form.length"
                     clearable
                     oninput="value=value.replace(/[^\d.]/g,'')"
-                    v-model="form.length"
                     :placeholder="'请输入'"
                   >
                     <i slot="suffix" class="neibu">CM </i>
@@ -160,9 +159,9 @@
               <el-col class="el-col-20">
                 <el-form-item :label="'宽'" prop="width">
                   <el-input
+                    v-model="form.width"
                     clearable
                     oninput="value=value.replace(/[^\d.]/g,'')"
-                    v-model="form.width"
                     :placeholder="'请输入'"
                   >
                     <i slot="suffix" class="neibu">CM </i>
@@ -172,9 +171,9 @@
               <el-col class="el-col-20">
                 <el-form-item :label="'高'" prop="height">
                   <el-input
+                    v-model="form.height"
                     clearable
                     oninput="value=value.replace(/[^\d.]/g,'')"
-                    v-model="form.height"
                     :placeholder="'请输入'"
                   >
                     <i slot="suffix" class="neibu">CM </i>
@@ -183,64 +182,46 @@
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'复购类型'">
-                  <el-select clearable v-model="form.repurchaseType">
+                  <el-select v-model="form.repurchaseType" clearable>
                     <el-option
                       v-for="item in repurchaseTypeList"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'上架状态'" prop="isPutOn">
-                  <el-select clearable v-model="form.isPutOn">
+                  <el-select v-model="form.isPutOn" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col class="el-col-20">
-                <el-form-item label="产品基本信息" prop="productBasName">
-                  <el-input
-                    clearable
-                    v-model="form.productBasName"
-                    @focus="opProduct"
-                  ></el-input>
-                </el-form-item>
-                <!-- <el-form-item label="产品基本信息" prop="pkProductBas">
-                  <el-select clearable v-model="form.pkProductBas" filterable>
-                    <el-option
-                      v-for="item in productList"
-                      :key="item.pkId"
-                      :label="item.productName"
-                      :value="item.pkId"
-                    ></el-option>
-                  </el-select>
-                </el-form-item> -->
-              </el-col>
+
               <el-col class="el-col-20">
                 <el-form-item label="供应商" prop="pkCubasdoc">
                   <el-select
+                    v-model="form.pkCubasdoc"
                     clearable
                     :placeholder="'请选择'"
-                    v-model="form.pkCubasdoc"
                   >
                     <el-option
                       v-for="item in supplierList"
                       :key="item.pkId"
                       :label="item.custName"
                       :value="item.pkId"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col class="el-col-40">
+              <el-col class="el-col-20">
                 <el-form-item :label="'产品主图'" prop="cover">
                   <!-- <el-upload :headers="headers"
                              :class="{ uploadIconOne: showImg, uploadIcon: noneUploadImg }"
@@ -256,16 +237,21 @@
                   <div class="jy">{{ '建议尺寸452×452，大小为200K' }}</div>
                 </el-form-item>
               </el-col>
+              <el-col key="wmsCode" class="el-col-20">
+                <el-form-item label="仓储编号" prop="wmsCode">
+                  <el-input v-model="form.wmsCode" :disabled="methods" />
+                </el-form-item>
+              </el-col>
             </el-row>
           </div>
           <div v-show="tabActive == 1">
             <el-form-item :label="'规格'" prop="pkSpecsType">
               <el-tag
-                :key="item.pkId"
                 v-for="(item, index) in ggList"
+                v-show="item.checked"
+                :key="item.pkId"
                 closable
                 class="elTag"
-                v-show="item.checked"
                 :disable-transitions="false"
                 @close="handleClose(item.pkId)"
               >
@@ -275,81 +261,80 @@
                 class="button-new-tag"
                 size="small"
                 @click="openDiag = true"
-                >{{ '添加' }}</el-button
-              >
+              >{{ '添加' }}</el-button>
             </el-form-item>
           </div>
           <div v-show="tabActive == 2">
             <el-row>
               <el-col class="el-col-20">
                 <el-form-item :label="'抽奖礼品'" prop="isPrize">
-                  <el-select clearable v-model="form.isPrize">
+                  <el-select v-model="form.isPrize" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'特惠礼品'" prop="isGift">
-                  <el-select clearable v-model="form.isGift">
+                  <el-select v-model="form.isGift" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'提货商品'" prop="isPickUp">
-                  <el-select clearable v-model="form.isPickUp">
+                  <el-select v-model="form.isPickUp" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'合并发货'" prop="isMerge">
-                  <el-select clearable v-model="form.isMerge">
+                  <el-select v-model="form.isMerge" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'冷链运输'" prop="isFresh">
-                  <el-select clearable v-model="form.isFresh">
+                  <el-select v-model="form.isFresh" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'追溯编号'" prop="isBarCode">
-                  <el-select clearable v-model="form.isBarCode">
+                  <el-select v-model="form.isBarCode" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -360,8 +345,7 @@
                       v-for="(item, index) in transportTypeList"
                       :key="item.value"
                       :label="item.value"
-                      >{{ item.label }}</el-checkbox
-                    >
+                    >{{ item.label }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
@@ -371,17 +355,15 @@
       </div>
       <div class="footer">
         <el-button size="small" class="cancelBtn">
-          {{ '取消' }}</el-button
-        >
+          {{ '取消' }}</el-button>
         <el-button
-          size="small"
           v-hasButtons="['ProductReleaseConfirm']"
-          @click="submit('form')"
+          size="small"
           style="background: #c8161d; border: none"
           class="sureBtn"
+          @click="submit('form')"
         >
-          {{ '确认' }}</el-button
-        >
+          {{ '确认' }}</el-button>
       </div>
     </div>
     <!-- 产品弹框 -->
@@ -400,43 +382,38 @@
               v-model="select.query"
               clearable
               :placeholder="'请输入'"
-              @keyup.enter.native="getProduct"
               prefix-icon="el-icon-search"
-            ></el-input>
+              @keyup.enter.native="getProduct"
+            />
           </el-col>
           <el-col :span="2">
             <el-button type="primary" size="small" @click="getProduct">
-              {{ '搜索' }}</el-button
-            >
+              {{ '搜索' }}</el-button>
           </el-col>
         </el-row>
-        <div style="height: 10px"></div>
+        <div style="height: 10px" />
         <el-table
-          :data="productList"
           ref="multipleTable"
+          :data="productList"
           height="500px"
           style="width: 100%"
-          @select-all="onSelectAll"
-          @select="selected"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
+          @select-all="onSelectAll"
+          @select="selected"
         >
-          <el-table-column type="selection" width="55">
-          </el-table-column>
+          <el-table-column type="selection" width="55" />
           <el-table-column
             align="center"
             prop="productName"
             :label="'产品名称'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="productCode"
             :label="'产品编号'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="unitStr" :label="'单位'">
-          </el-table-column>
+          />
+          <el-table-column align="center" prop="unitStr" :label="'单位'" />
         </el-table>
       </div>
       <pagination
@@ -465,11 +442,10 @@
         <el-checkbox-group v-model="form.checkList" class="check">
           <el-checkbox
             v-for="(item, index) in ggList"
-            class="check_i"
             :key="item.pkId"
+            class="check_i"
             :label="item.pkId"
-            >{{ item.typeName }}</el-checkbox
-          >
+          >{{ item.typeName }}</el-checkbox>
         </el-checkbox-group>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -482,172 +458,176 @@
   </div>
 </template>
 <script>
-import { getToken } from "@/utils/auth";
-import * as api from "@/api/product.js";
-import ImageUpload from "@/components/ImageUpload";
-import * as supply from "@/api/supply.js";
+import { getToken } from '@/utils/auth'
+import * as api from '@/api/product.js'
+import ImageUpload from '@/components/ImageUpload'
+import * as supply from '@/api/supply.js'
 
 export default {
-  name: "jcsz",
+  name: 'Jcsz',
   components: {
-    ImageUpload,
+    ImageUpload
   },
   data() {
     return {
-      selectData:{},
-      select:{},
+      selectData: {},
+      select: {},
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
-      dialogVisible:false,
+      dialogVisible: false,
       rules: {
         shippingChannel: [
           {
             required: true,
             message: '请输入发货类型',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
-        unit: [{ required: true, message: "请选择单位", trigger: "change" }],
+        unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
         productName: [
-          { required: true, message: "请输入产品名称", trigger: "blur" },
+          { required: true, message: '请输入产品名称', trigger: 'blur' }
         ],
         retailPrice: [
-          { required: true, message: '请输入划线价', trigger: "blur" },
+          { required: true, message: '请输入划线价', trigger: 'blur' }
         ],
         shelfLife: [
-          { required: true, message: '请输入保质期', trigger: "blur" },
+          { required: true, message: '请输入保质期', trigger: 'blur' }
         ],
-        weight: [{ required: true, message: "请输入重量", trigger: "blur" }],
+        weight: [{ required: true, message: '请输入重量', trigger: 'blur' }],
         productCode: [
-          { required: true, message: "请输入产品编号", trigger: "blur" },
+          { required: true, message: '请输入产品编号', trigger: 'blur' }
         ],
         postageWeight: [
-          { required: true, message: '请输入邮费重量', trigger: "blur" },
+          { required: true, message: '请输入邮费重量', trigger: 'blur' }
         ],
         productAttr: [
           {
             required: true,
             message: '请选择产品属性',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         isPutOn: [
-          { required: true, message: '请选择', trigger: "change" },
+          { required: true, message: '请选择', trigger: 'change' }
         ],
         productBasName: [
-          { required: true, message: '请选择', trigger: "change" },
+          { required: true, message: '请选择', trigger: 'change' }
         ],
         pkClassify: [
           {
             required: true,
             message: '请选择所属分类',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         sort: [
-          { required: true, message: '请输入排列序号', trigger: "blur" },
+          { required: true, message: '请输入排列序号', trigger: 'blur' }
         ],
-        length: [{ required: true, message: "请输入长", trigger: "blur" }],
-        width: [{ required: true, message: "请输入宽", trigger: "blur" }],
-        height: [{ required: true, message: "请输入高", trigger: "blur" }],
+        length: [{ required: true, message: '请输入长', trigger: 'blur' }],
+        width: [{ required: true, message: '请输入宽', trigger: 'blur' }],
+        height: [{ required: true, message: '请输入高', trigger: 'blur' }],
         cover: [
-          { required: true, message: "请上传产品主图", trigger: "change" },
+          { required: true, message: '请上传产品主图', trigger: 'change' }
         ],
         pkSpecsType: [
-          { required: true, message: "请选择规格", trigger: "change" },
+          { required: true, message: '请选择规格', trigger: 'change' }
         ],
         isPrize: [
           {
             required: true,
             message: '抽奖礼品',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         isGift: [
-          { required: true, message: "请选择特惠礼品", trigger: "change" },
+          { required: true, message: '请选择特惠礼品', trigger: 'change' }
         ],
         isPickUp: [
-          { required: true, message: "请选择提货商品", trigger: "change" },
+          { required: true, message: '请选择提货商品', trigger: 'change' }
         ],
         isMerge: [
           {
             required: true,
             message: '请选择合并发货',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         isFresh: [
           {
             required: true,
             message: '请选择冷链运输',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         pkCubasdoc: [
           {
             required: true,
             message: '请选择',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         isBarCode: [
-          { required: true, message: "请选择条码管理", trigger: "change" },
+          { required: true, message: '请选择条码管理', trigger: 'change' }
         ],
         ysList: [
-          { required: true, message: '请选择运输方式', trigger: "change" },
+          { required: true, message: '请选择运输方式', trigger: 'change' }
         ],
+        wmsCode: [
+          { required: true, message: '请输入仓储编号', trigger: 'blur' }
+        ]
       },
       ggList: [],
       // 规格名称弹框
       openDiag: false,
-      showImg: true, //默认展示
+      showImg: true, // 默认展示
       noneUploadImg: false, //
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/upload",
+      uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       form: {
-        productBasName:'',
-        productCode: "",
-        sptw: "",
+        productBasName: '',
+        productCode: '',
+        sptw: '',
         checkList: [],
         ysList: [],
-        sort: "",
-        postageWeight: "",
-        height: "",
-        width: "",
-        length: "",
-        weight: "",
-        shelfLife: "",
-        retailPrice: "",
+        sort: '',
+        postageWeight: '',
+        height: '',
+        width: '',
+        length: '',
+        weight: '',
+        shelfLife: '',
+        retailPrice: '',
+        wmsCode: ''
       },
       tabActive: 0,
       agreeList: [
         {
           text: '允许',
-          val: 0,
+          val: 0
         },
         {
           text: '禁止',
-          val: 1,
-        },
+          val: 1
+        }
       ],
       topList: [
         {
           name: '基础设置',
-          id: 0,
+          id: 0
         },
         {
           name: '规格明细',
-          id: 1,
+          id: 1
         },
         {
           name: '拓展设置',
-          id: 2,
-        },
+          id: 2
+        }
       ],
       productTypeList: [],
       fhTypeList: [],
@@ -656,162 +636,163 @@ export default {
       transportTypeList: [],
       repurchaseTypeList: [],
       productList: [],
-      supplierList: [],
-    };
+      supplierList: []
+    }
   },
   mounted() {
     // 获取规格list
-    this.getGg();
+    this.getGg()
     // // 产品属性枚举
-    this.getProductType();
+    this.getProductType()
     // 发货类型
-    this.getShipping();
+    this.getShipping()
     // 单位
-    this.getUnit();
+    this.getUnit()
     // 复购类型
-    this.getRepurchaseType();
+    this.getRepurchaseType()
     // 所属分类
-    this.getClassifyAll();
+    this.getClassifyAll()
     // 运输方式
-    this.getTransportType();
+    this.getTransportType()
     // 获取产品编号
-    this.getProductCode();
+    this.getProductCode()
     // 获取排序
-    this.getSort();
+    this.getSort()
     // 获取产品
-    this.getProduct();
+    this.getProduct()
   },
   methods: {
-    sureProduct(){
+    sureProduct() {
       this.form.productBasName = this.selectData.productName
       this.form.pkProductBas = this.selectData.pkId
       this.dialogVisible = false
     },
     onSelectAll() {
-      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.clearSelection()
     },
     selected(selection, row) {
-      this.$refs.multipleTable.clearSelection();
-      if (selection.length == 0) return;
-      this.$refs.multipleTable.toggleRowSelection(row, true);
-      this.selectData = row;
+      this.$refs.multipleTable.clearSelection()
+      if (selection.length == 0) return
+      this.$refs.multipleTable.toggleRowSelection(row, true)
+      this.selectData = row
     },
     handleClose1() {
       this.dialogVisible = false
     },
-    opProduct(){
+    opProduct() {
       this.dialogVisible = true
     },
     getProduct() {
       api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
-        this.productList = res.rows;
+        this.productList = res.rows
         this.total = res.total
-      });
+      })
     },
     getRepurchaseType() {
       api.repurchaseType().then((res) => {
-        this.repurchaseTypeList = res.data;
-      });
+        this.repurchaseTypeList = res.data
+      })
       supply.supplierList().then((res) => {
-        this.supplierList = res.rows;
-      });
+        this.supplierList = res.rows
+      })
     },
     getSort() {
       api.getMaxSort().then((res) => {
-        this.form.sort = res.data;
-      });
+        this.form.sort = res.data
+      })
     },
     getProductCode() {
       api.getProductCode().then((res) => {
-        this.form.productCode = res.msg;
-      });
+        this.form.productCode = res.msg
+        this.form.wmsCode = res.msg
+      })
     },
     // 运输方式单独三个字段
     changeYsfs(val) {
       // 有陆运
       if (val.indexOf(1) > -1) {
-        this.form.isLandTrans = 0;
+        this.form.isLandTrans = 0
       } else {
-        this.form.isLandTrans = 1;
+        this.form.isLandTrans = 1
       }
       // 有空运
       if (val.indexOf(2) > -1) {
-        this.form.isAirTrans = 0;
+        this.form.isAirTrans = 0
       } else {
-        this.form.isAirTrans = 1;
+        this.form.isAirTrans = 1
       }
       // 海运
       if (val.indexOf(3) > -1) {
-        this.form.isOceanTrans = 0;
+        this.form.isOceanTrans = 0
       } else {
-        this.form.isOceanTrans = 1;
+        this.form.isOceanTrans = 1
       }
     },
     // 运输方式
     getTransportType() {
       api.transportType().then((res) => {
-        this.transportTypeList = res.data;
-      });
+        this.transportTypeList = res.data
+      })
     },
     // 所属分类
     getClassifyAll() {
       api.classifyAll().then((res) => {
-        this.classifyList = res.data;
-      });
+        this.classifyList = res.data
+      })
     },
     // 选完规格
     checkTrue() {
       this.ggList.forEach((item) => {
-        item.checked = false;
-      });
+        item.checked = false
+      })
       this.ggList.forEach((item) => {
         this.form.checkList.forEach((child) => {
           if (item.pkId == child) {
-            item.checked = true;
+            item.checked = true
           }
-        });
-      });
-      this.openDiag = false;
-      this.form.pkSpecsType = this.form.checkList;
+        })
+      })
+      this.openDiag = false
+      this.form.pkSpecsType = this.form.checkList
     },
     // 获取规格
     getGg() {
       api.findAll().then((res) => {
         res.data.forEach((item) => {
-          item.checked = false;
-        });
-        this.ggList = res.data;
-      });
+          item.checked = false
+        })
+        this.ggList = res.data
+      })
     },
     // 产品属性枚举
     getProductType() {
       api.productType().then((res) => {
-        this.productTypeList = res.data;
-      });
+        this.productTypeList = res.data
+      })
     },
     // 发货类型
     getShipping() {
       api.getShipping().then((res) => {
-        this.fhTypeList = res.data;
-      });
+        this.fhTypeList = res.data
+      })
     },
     // 单位
     getUnit() {
       api.unitAll().then((res) => {
-        this.dwList = res.data;
-      });
+        this.dwList = res.data
+      })
     },
     // 移除规格
     handleClose(pkId) {
       // 引藏全规格中选中字段
       this.ggList.forEach((item) => {
         if (item.pkId == pkId) {
-          item.checked = false;
+          item.checked = false
         }
-      });
+      })
       // 移除表单选中
-      this.form.checkList.splice(this.form.checkList.indexOf(pkId), 1);
-      this.$forceUpdate();
+      this.form.checkList.splice(this.form.checkList.indexOf(pkId), 1)
+      this.$forceUpdate()
     },
     submit(form) {
       this.$refs[form].validate((valid) => {
@@ -820,27 +801,27 @@ export default {
             if (res.code == 200) {
               this.$message({
                 message: '添加成功',
-                type: "success",
-              });
+                type: 'success'
+              })
               this.$router.replace({
-                path: "/goodsManage/productList",
-              });
+                path: '/goodsManage/productList'
+              })
             } else {
               this.$message({
                 message: res.msg,
-                type: "warning",
-                duration: 3000,
-              });
+                type: 'warning',
+                duration: 3000
+              })
             }
-          });
+          })
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     // 切换tab
     handleLink(id) {
-      this.tabActive = id;
+      this.tabActive = id
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
@@ -849,22 +830,22 @@ export default {
         return 'success-row'
       }
       return ''
-    },
+    }
     // uploadImgChange(file, fileList) {
     //   this.noneUploadImg = fileList.length > 0
     //   this.$refs.form.clearValidate('cover')
     // },
-    //图片上传成功后的回调
+    // 图片上传成功后的回调
     // handlePictureSuccess(res, file) {
     //   this.form.cover = res.data.url
     // },
-    //图片上传删除
+    // 图片上传删除
     // handleRemove(file, fileList) {
     //   this.form.cover = ''
     //   this.noneUploadImg = fileList.length > 0
     // },
-  },
-};
+  }
+}
 </script>
 <style scoped lang="scss">
 ::v-deep .el-select {
diff --git a/src/views/goodsManage/productRelease/productDetail.vue b/src/views/goodsManage/productRelease/productDetail.vue
index 633818b..a6e8370 100644
--- a/src/views/goodsManage/productRelease/productDetail.vue
+++ b/src/views/goodsManage/productRelease/productDetail.vue
@@ -7,393 +7,521 @@
 <template>
   <div class="page">
     <div class="topbox">
-      <div class="levelList_i"
-           :class="tabActive == item.id ? 'act' : ''"
-           v-for="(item, index) in topList"
-           :key="index"
-           @click.prevent="handleLink(item.id)">
+      <div
+        v-for="(item, index) in topList"
+        :key="index"
+        class="levelList_i"
+        :class="tabActive == item.id ? 'act' : ''"
+        @click.prevent="handleLink(item.id)"
+      >
         {{ item.name }}
       </div>
     </div>
     <div class="main">
       <div class="contain">
-        <el-form ref="form"
-                 :rules="rules"
-                 :model="form"
-                 label-width="auto">
+        <el-form
+          ref="form"
+          :rules="rules"
+          :model="form"
+          label-width="auto"
+        >
           <div v-show="tabActive==0">
             <el-row :gutter="10">
               <el-col class="el-col-40">
-                <el-form-item :label="'产品名称'"
-                              prop="productName">
-                  <el-input clearable
-                            v-model="form.productName"
-                            :disabled="methods"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'产品名称'"
+                  prop="productName"
+                >
+                  <el-input
+                    v-model="form.productName"
+                    clearable
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'产品编号'"
-                              prop="productCode">
-                  <el-input clearable
-                            v-model="form.productCode"
-                            disabled
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'产品编号'"
+                  prop="productCode"
+                >
+                  <el-input
+                    v-model="form.productCode"
+                    clearable
+                    disabled
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'划线价'"
-                              prop="retailPrice">
-                  <el-input clearable
-                            v-model="form.retailPrice"
-                            :disabled="methods"
-                            :placeholder="'请输入'"></el-input>
+                <el-form-item
+                  :label="'划线价'"
+                  prop="retailPrice"
+                >
+                  <el-input
+                    v-model="form.retailPrice"
+                    clearable
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  />
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'发货类型'"
-                              prop="shippingChannel">
-                  <el-select clearable
-                             v-model="form.shippingChannel"
-                             :disabled="methods">
-                    <el-option v-for="item in fhTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                <el-form-item
+                  :label="'发货类型'"
+                  prop="shippingChannel"
+                >
+                  <el-select
+                    v-model="form.shippingChannel"
+                    clearable
+                    :disabled="methods"
+                  >
+                    <el-option
+                      v-for="item in fhTypeList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item label="保质期"
-                              prop="shelfLife">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d]/g,'')"
-                            v-model="form.shelfLife"
-                            :disabled="methods"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">{{'天'}} </i>
+                <el-form-item
+                  label="保质期"
+                  prop="shelfLife"
+                >
+                  <el-input
+                    v-model="form.shelfLife"
+                    clearable
+                    oninput="value=value.replace(/[^\d]/g,'')"
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  >
+                    <i
+                      slot="suffix"
+                      class="neibu"
+                    >{{ '天' }} </i>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label=''单位''
-                              prop="unit">
-                  <el-select clearable
-                             v-model="form.unit"
-                             :disabled="methods">
-                    <el-option v-for="item in dwList"
-                               :key="item.pkId"
-                               :label="item.name"
-                               :value="item.pkId"></el-option>
+                <el-form-item
+                  :label=""
+                  单位''
+                  prop="unit"
+                >
+                  <el-select
+                    v-model="form.unit"
+                    clearable
+                    :disabled="methods"
+                  >
+                    <el-option
+                      v-for="item in dwList"
+                      :key="item.pkId"
+                      :label="item.name"
+                      :value="item.pkId"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'重量'"
-                              prop="weight">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.weight"
-                            :disabled="methods"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">KG </i>
+                <el-form-item
+                  :label="'重量'"
+                  prop="weight"
+                >
+                  <el-input
+                    v-model="form.weight"
+                    clearable
+                    oninput="value=value.replace(/[^\d.]/g,'')"
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  >
+                    <i
+                      slot="suffix"
+                      class="neibu"
+                    >KG </i>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'邮费重量'"
-                              prop="postageWeight">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.postageWeight"
-                            :disabled="methods"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">KG </i>
+                <el-form-item
+                  :label="'邮费重量'"
+                  prop="postageWeight"
+                >
+                  <el-input
+                    v-model="form.postageWeight"
+                    clearable
+                    oninput="value=value.replace(/[^\d.]/g,'')"
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  >
+                    <i
+                      slot="suffix"
+                      class="neibu"
+                    >KG </i>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'产品属性'"
-                              prop="productAttr">
-                  <el-select clearable
-                             v-model="form.productAttr"
-                             :disabled="methods">
-                    <el-option v-for="item in productTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                <el-form-item
+                  :label="'产品属性'"
+                  prop="productAttr"
+                >
+                  <el-select
+                    v-model="form.productAttr"
+                    clearable
+                    :disabled="methods"
+                  >
+                    <el-option
+                      v-for="item in productTypeList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'所属分类'"
-                              prop="pkClassify">
-                  <el-select clearable
-                             v-model="form.pkClassify"
-                             :disabled="methods">
-                    <el-option v-for="item in classifyList"
-                               :key="item.pkId"
-                               :label="item.name"
-                               :value="item.pkId"></el-option>
+                <el-form-item
+                  :label="'所属分类'"
+                  prop="pkClassify"
+                >
+                  <el-select
+                    v-model="form.pkClassify"
+                    clearable
+                    :disabled="methods"
+                  >
+                    <el-option
+                      v-for="item in classifyList"
+                      :key="item.pkId"
+                      :label="item.name"
+                      :value="item.pkId"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'排列序号'"
-                              prop="sort">
-                  <el-input clearable
-                            oninput="value = value.replace(/[^\d]/g,'')"
-                            v-model="form.sort"
-                            :disabled="methods"
-                            :placeholder="'请输入'">
+                <el-form-item
+                  :label="'排列序号'"
+                  prop="sort"
+                >
+                  <el-input
+                    v-model="form.sort"
+                    clearable
+                    oninput="value = value.replace(/[^\d]/g,'')"
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col class="el-col-20">
+                <el-form-item
+                  :label="'长'"
+                  prop="length"
+                >
+                  <el-input
+                    v-model="form.length"
+                    clearable
+                    oninput="value=value.replace(/[^\d.]/g,'')"
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  >
+                    <i
+                      slot="suffix"
+                      class="neibu"
+                    >CM </i>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'长'"
-                              prop="length">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.length"
-                            :disabled="methods"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">CM </i>
+                <el-form-item
+                  :label="'宽'"
+                  prop="width"
+                >
+                  <el-input
+                    v-model="form.width"
+                    clearable
+                    oninput="value=value.replace(/[^\d.]/g,'')"
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  >
+                    <i
+                      slot="suffix"
+                      class="neibu"
+                    >CM </i>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
-                <el-form-item :label="'宽'"
-                              prop="width">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.width"
-                            :disabled="methods"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">CM </i>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'高'"
-                              prop="height">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.height"
-                            :disabled="methods"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">CM </i>
+                <el-form-item
+                  :label="'高'"
+                  prop="height"
+                >
+                  <el-input
+                    v-model="form.height"
+                    clearable
+                    oninput="value=value.replace(/[^\d.]/g,'')"
+                    :disabled="methods"
+                    :placeholder="'请输入'"
+                  >
+                    <i
+                      slot="suffix"
+                      class="neibu"
+                    >CM </i>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'复购类型'">
-                  <el-select clearable
-                             :disabled="methods"
-                             v-model="form.repurchaseType">
-                    <el-option v-for="item in repurchaseTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
+                  <el-select
+                    v-model="form.repurchaseType"
+                    clearable
+                    :disabled="methods"
+                  >
+                    <el-option
+                      v-for="item in repurchaseTypeList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'上架状态'" prop="isPutOn">
-                  <el-select clearable v-model="form.isPutOn">
+                  <el-select v-model="form.isPutOn" clearable>
                     <el-option
                       v-for="item in agreeList"
                       :key="item.val"
                       :label="item.text"
                       :value="item.val"
-                    ></el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col class="el-col-20">
-                <!-- <el-form-item label="产品基本信息" prop="pkProductBas">
-                  <el-select clearable v-model="form.pkProductBas" filterable>
-                    <el-option
-                      v-for="item in productList"
-                      :key="item.pkId"
-                      :label="item.productName"
-                      :value="item.pkId"
-                    ></el-option>
-                  </el-select>
-                </el-form-item> -->
-                <el-form-item label="产品基本信息" prop="productBasName">
-                  <el-input
-                    clearable
-                    v-model="form.productBasName"
-                    @focus="opProduct"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
+
               <el-col class="el-col-20">
                 <el-form-item label="供应商" prop="pkCubasdoc">
-              <el-select
-                clearable
-                :placeholder="'请选择'"
-                v-model="form.pkCubasdoc"
-              >
-                <el-option
-                  v-for="item in supplierList"
-                  :key="item.pkId"
-                  :label="item.custName"
-                  :value="item.pkId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+                  <el-select
+                    v-model="form.pkCubasdoc"
+                    clearable
+                    :placeholder="'请选择'"
+                  >
+                    <el-option
+                      v-for="item in supplierList"
+                      :key="item.pkId"
+                      :label="item.custName"
+                      :value="item.pkId"
+                    />
+                  </el-select>
+                </el-form-item>
               </el-col>
-              <el-col class="el-col-40">
-                <el-form-item :label="'产品主图'"
-                              prop="cover">
-                  <el-upload :headers="headers"
-                             :disabled="methods"
-                             :class="{ uploadIconOne: showImg, uploadIcon: noneUploadImg }"
-                             :action="uploadImgUrl"
-                             :file-list="form.coverList"
-                             :on-success="handlePictureSuccess"
-                             :on-change="uploadImgChange"
-                             list-type="picture-card"
-                             :limit="1"
-                             :on-remove="handleRemove">
-                    <i class="el-icon-plus"></i>
+              <el-col class="el-col-20">
+                <el-form-item
+                  :label="'产品主图'"
+                  prop="cover"
+                >
+                  <el-upload
+                    :headers="headers"
+                    :disabled="methods"
+                    :class="{ uploadIconOne: showImg, uploadIcon: noneUploadImg }"
+                    :action="uploadImgUrl"
+                    :file-list="form.coverList"
+                    :on-success="handlePictureSuccess"
+                    :on-change="uploadImgChange"
+                    list-type="picture-card"
+                    :limit="1"
+                    :on-remove="handleRemove"
+                  >
+                    <i class="el-icon-plus" />
                   </el-upload>
                   <div class="jy">建议尺寸452×452，大小为200K</div>
                 </el-form-item>
               </el-col>
-
+              <el-col key="wmsCode" class="el-col-20">
+                <el-form-item label="仓储编号" prop="wmsCode">
+                  <el-input v-model="form.wmsCode" :disabled="methods" />
+                </el-form-item>
+              </el-col>
             </el-row>
           </div>
           <div v-show="tabActive==1">
-            <el-form-item :label="'规格'"
-                          prop="pkSpecsType">
-              <el-tag :key="item.pkId"
-                      v-for="item,index in ggList"
-                      :closable="!methods"
-                      class="elTag"
-                      v-show="item.checked"
-                      :disable-transitions="false"
-                      @close="handleClose(item.pkId)">
-                {{item.typeName}}
+            <el-form-item
+              :label="'规格'"
+              prop="pkSpecsType"
+            >
+              <el-tag
+                v-for="item,index in ggList"
+                v-show="item.checked"
+                :key="item.pkId"
+                :closable="!methods"
+                class="elTag"
+                :disable-transitions="false"
+                @close="handleClose(item.pkId)"
+              >
+                {{ item.typeName }}
               </el-tag>
-              <el-button class="button-new-tag"
-                         v-show="!methods"
-                         size="small"
-                         @click="openDiag=true">{{'添加'}}</el-button>
+              <el-button
+                v-show="!methods"
+                class="button-new-tag"
+                size="small"
+                @click="openDiag=true"
+              >{{ '添加' }}</el-button>
             </el-form-item>
           </div>
           <div v-show="tabActive==2">
             <el-col class="el-col-20">
-              <el-form-item :label="'抽奖礼品'"
-                            prop="isPrize">
-                <el-select clearable
-                           v-model="form.isPrize"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
+              <el-form-item
+                :label="'抽奖礼品'"
+                prop="isPrize"
+              >
+                <el-select
+                  v-model="form.isPrize"
+                  clearable
+                  :disabled="methods"
+                >
+                  <el-option
+                    v-for="item in agreeList"
+                    :key="item.val"
+                    :label="item.text"
+                    :value="item.val"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col class="el-col-20">
-              <el-form-item :label="'特惠礼品'"
-                            prop="isGift">
-                <el-select clearable
-                           v-model="form.isGift"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
+              <el-form-item
+                :label="'特惠礼品'"
+                prop="isGift"
+              >
+                <el-select
+                  v-model="form.isGift"
+                  clearable
+                  :disabled="methods"
+                >
+                  <el-option
+                    v-for="item in agreeList"
+                    :key="item.val"
+                    :label="item.text"
+                    :value="item.val"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col class="el-col-20">
-              <el-form-item :label="'提货商品'"
-                            prop="isPickUp">
-                <el-select clearable
-                           v-model="form.isPickUp"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
+              <el-form-item
+                :label="'提货商品'"
+                prop="isPickUp"
+              >
+                <el-select
+                  v-model="form.isPickUp"
+                  clearable
+                  :disabled="methods"
+                >
+                  <el-option
+                    v-for="item in agreeList"
+                    :key="item.val"
+                    :label="item.text"
+                    :value="item.val"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col class="el-col-20">
-              <el-form-item :label="'合并发货'"
-                            prop="isMerge">
-                <el-select clearable
-                           v-model="form.isMerge"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
+              <el-form-item
+                :label="'合并发货'"
+                prop="isMerge"
+              >
+                <el-select
+                  v-model="form.isMerge"
+                  clearable
+                  :disabled="methods"
+                >
+                  <el-option
+                    v-for="item in agreeList"
+                    :key="item.val"
+                    :label="item.text"
+                    :value="item.val"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col class="el-col-20">
-              <el-form-item :label="'冷链运输'"
-                            prop="isFresh">
-                <el-select clearable
-                           v-model="form.isFresh"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
+              <el-form-item
+                :label="'冷链运输'"
+                prop="isFresh"
+              >
+                <el-select
+                  v-model="form.isFresh"
+                  clearable
+                  :disabled="methods"
+                >
+                  <el-option
+                    v-for="item in agreeList"
+                    :key="item.val"
+                    :label="item.text"
+                    :value="item.val"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col class="el-col-20">
-              <el-form-item :label="'追溯编号'"
-                            prop="isBarCode">
-                <el-select clearable
-                           v-model="form.isBarCode"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
+              <el-form-item
+                :label="'追溯编号'"
+                prop="isBarCode"
+              >
+                <el-select
+                  v-model="form.isBarCode"
+                  clearable
+                  :disabled="methods"
+                >
+                  <el-option
+                    v-for="item in agreeList"
+                    :key="item.val"
+                    :label="item.text"
+                    :value="item.val"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col class="el-col-20">
-              <el-form-item :label="'运输方式'"
-                            prop="ysList">
-                <el-checkbox-group v-model="form.ysList"
-                                   :disabled="methods"
-                                   @change="changeYsfs">
-                  <el-checkbox v-for="item,index in transportTypeList"
-                               :key="item.value"
-                               :label="item.value">{{item.label}}</el-checkbox>
+              <el-form-item
+                :label="'运输方式'"
+                prop="ysList"
+              >
+                <el-checkbox-group
+                  v-model="form.ysList"
+                  :disabled="methods"
+                  @change="changeYsfs"
+                >
+                  <el-checkbox
+                    v-for="item,index in transportTypeList"
+                    :key="item.value"
+                    :label="item.value"
+                  >{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
           </div>
         </el-form>
       </div>
-      <div class="footer"
-           v-show="!methods">
-        <el-button size="small"
-                   class="thebtn2"> {{ '取消' }}</el-button>
-        <el-button size="small"
-                   @click="submit('form')"
-                   class="thebtn1"> {{ '确认' }}</el-button>
+      <div
+        v-show="!methods"
+        class="footer"
+      >
+        <el-button
+          size="small"
+          class="thebtn2"
+        > {{ '取消' }}</el-button>
+        <el-button
+          size="small"
+          class="thebtn1"
+          @click="submit('form')"
+        > {{ '确认' }}</el-button>
       </div>
     </div>
-       <!-- 产品弹框 -->
-       <el-dialog
+    <!-- 产品弹框 -->
+    <el-dialog
       :title="'添加'"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
@@ -408,43 +536,38 @@
               v-model="select.query"
               clearable
               :placeholder="'请输入'"
-              @keyup.enter.native="getProduct"
               prefix-icon="el-icon-search"
-            ></el-input>
+              @keyup.enter.native="getProduct"
+            />
           </el-col>
           <el-col :span="2">
             <el-button type="primary" size="small" @click="getProduct">
-              {{ '搜索' }}</el-button
-            >
+              {{ '搜索' }}</el-button>
           </el-col>
         </el-row>
-        <div style="height: 10px"></div>
+        <div style="height: 10px" />
         <el-table
-          :data="productList"
           ref="multipleTable"
+          :data="productList"
           height="500px"
           style="width: 100%"
-          @select-all="onSelectAll"
-          @select="selected"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
+          @select-all="onSelectAll"
+          @select="selected"
         >
-          <el-table-column type="selection" width="55">
-          </el-table-column>
+          <el-table-column type="selection" width="55" />
           <el-table-column
             align="center"
             prop="productName"
             :label="'产品名称'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="productCode"
             :label="'产品编号'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="unitStr" :label="'单位'">
-          </el-table-column>
+          />
+          <el-table-column align="center" prop="unitStr" :label="'单位'" />
         </el-table>
       </div>
       <pagination
@@ -462,23 +585,33 @@
       </span>
     </el-dialog>
     <!-- 规格 -->
-    <el-dialog :title="'添加'"
-               :visible.sync="openDiag"
-               :close-on-click-modal="false"
-               width="30%"
-               center>
-      <el-checkbox-group v-model="form.checkList"
-                         class="check">
-        <el-checkbox v-for="item,index in ggList"
-                     class="check_i"
-                     :key="item.pkId"
-                     :label="item.pkId">{{item.typeName}}</el-checkbox>
+    <el-dialog
+      :title="'添加'"
+      :visible.sync="openDiag"
+      :close-on-click-modal="false"
+      width="30%"
+      center
+    >
+      <el-checkbox-group
+        v-model="form.checkList"
+        class="check"
+      >
+        <el-checkbox
+          v-for="item,index in ggList"
+          :key="item.pkId"
+          class="check_i"
+          :label="item.pkId"
+        >{{ item.typeName }}</el-checkbox>
       </el-checkbox-group>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="openDiag = false">{{'取消'}}</el-button>
-        <el-button type="primary"
-                   @click="checkTrue">{{'确认'}}</el-button>
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button @click="openDiag = false">{{ '取消' }}</el-button>
+        <el-button
+          type="primary"
+          @click="checkTrue"
+        >{{ '确认' }}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -486,127 +619,130 @@
 <script>
 import { getToken } from '@/utils/auth'
 import * as api from '@/api/product.js'
-import * as supply from "@/api/supply.js";
+import * as supply from '@/api/supply.js'
 
 import { productUpdate, productSave } from '@/api/product.js'
 export default {
-  name: 'jcsz',
+  name: 'Jcsz',
   data() {
     return {
-      selectData:{},
-      select:{},
+      selectData: {},
+      select: {},
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       total: 0,
-      dialogVisible:false,
+      dialogVisible: false,
       rules: {
         shippingChannel: [
           {
             required: true,
             message: '请输入发货类型',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
         productName: [
-          { required: true, message: '请输入产品名称', trigger: 'blur' },
+          { required: true, message: '请输入产品名称', trigger: 'blur' }
         ],
         productCode: [
-          { required: true, message: '请输入产品编号', trigger: 'blur' },
+          { required: true, message: '请输入产品编号', trigger: 'blur' }
         ],
         retailPrice: [
-          { required: true, message: '请输入划线价', trigger: 'blur' },
+          { required: true, message: '请输入划线价', trigger: 'blur' }
         ],
         shelfLife: [
-          { required: true, message: '请输入保质期', trigger: 'blur' },
+          { required: true, message: '请输入保质期', trigger: 'blur' }
         ],
         weight: [{ required: true, message: '请输入重量', trigger: 'blur' }],
         postageWeight: [
-          { required: true, message: '请输入邮费重量', trigger: 'blur' },
+          { required: true, message: '请输入邮费重量', trigger: 'blur' }
         ],
         productAttr: [
           {
             required: true,
             message: '请选择产品属性',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         pkClassify: [
           {
             required: true,
             message: '请选择所属分类',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         sort: [
-          { required: true, message: '请输入排列序号', trigger: 'blur' },
+          { required: true, message: '请输入排列序号', trigger: 'blur' }
         ],
         length: [{ required: true, message: '请输入长', trigger: 'blur' }],
         width: [{ required: true, message: '请输入宽', trigger: 'blur' }],
         height: [{ required: true, message: '请输入高', trigger: 'blur' }],
         cover: [
-          { required: true, message: '请上传产品主图', trigger: 'change' },
+          { required: true, message: '请上传产品主图', trigger: 'change' }
         ],
         pkSpecsType: [
-          { required: true, message: '请选择规格', trigger: 'change' },
+          { required: true, message: '请选择规格', trigger: 'change' }
         ],
         isPutOn: [
-          { required: true, message: '请选择', trigger: "change" },
+          { required: true, message: '请选择', trigger: 'change' }
         ],
         productBasName: [
-          { required: true, message: '请选择', trigger: "change" },
+          { required: true, message: '请选择', trigger: 'change' }
         ],
         isPrize: [
           {
             required: true,
             message: '抽奖礼品',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         pkCubasdoc: [
           {
             required: true,
             message: '请选择',
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         isGift: [
-          { required: true, message: '请选择特惠礼品', trigger: 'change' },
+          { required: true, message: '请选择特惠礼品', trigger: 'change' }
         ],
         isPickUp: [
-          { required: true, message: '请选择提货商品', trigger: 'change' },
+          { required: true, message: '请选择提货商品', trigger: 'change' }
         ],
         isMerge: [
           {
             required: true,
             message: '请选择合并发货',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         isFresh: [
           {
             required: true,
             message: '冷链运输',
-            trigger: 'change',
-          },
+            trigger: 'change'
+          }
         ],
         isBarCode: [
-          { required: true, message: '请选择条码管理', trigger: 'change' },
+          { required: true, message: '请选择条码管理', trigger: 'change' }
         ],
         ysList: [
-          { required: true, message: '请选择运输方式', trigger: 'change' },
+          { required: true, message: '请选择运输方式', trigger: 'change' }
         ],
+        wmsCode: [
+          { required: true, message: '请输入仓储编号', trigger: 'blur' }
+        ]
       },
       ggList: [],
       // 规格名称弹框
       openDiag: false,
-      showImg: true, //默认展示
+      showImg: true, // 默认展示
       noneUploadImg: false, //
       uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
       headers: {
-        Authorization: getToken(),
+        Authorization: getToken()
       },
       form: {
         sort: '',
@@ -621,31 +757,32 @@ export default {
         length: '',
         weight: '',
         shelfLife: '',
+        wmsCode: ''
       },
       tabActive: 0,
       agreeList: [
         {
           text: '允许',
-          val: 0,
+          val: 0
         },
         {
           text: '禁止',
-          val: 1,
-        },
+          val: 1
+        }
       ],
       topList: [
         {
           name: '基础设置',
-          id: 0,
+          id: 0
         },
         {
           name: '规格明细',
-          id: 1,
+          id: 1
         },
         {
           name: '拓展设置',
-          id: 2,
-        },
+          id: 2
+        }
       ],
       productTypeList: [],
       fhTypeList: [],
@@ -658,7 +795,7 @@ export default {
       repurchaseTypeList: [],
       productList: [],
       isType: 0,
-      supplierList:[]
+      supplierList: []
     }
   },
   mounted() {
@@ -672,7 +809,7 @@ export default {
       // this.form.pkProductBas = this.$route.query.pkProductBas
     }
 
-    this.methods = this.$route.query.methods ? false : true
+    this.methods = !this.$route.query.methods
     this.wahtMethods = this.$route.query.methods
     // 获取规格list
     this.getGg()
@@ -691,39 +828,39 @@ export default {
     this.getProduct()
   },
   methods: {
-    sureProduct(){
+    sureProduct() {
       this.form.productBasName = this.selectData.productName
       this.form.pkProductBas = this.selectData.pkId
       this.dialogVisible = false
     },
     onSelectAll() {
-      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.clearSelection()
     },
     selected(selection, row) {
-      this.$refs.multipleTable.clearSelection();
-      if (selection.length == 0) return;
-      this.$refs.multipleTable.toggleRowSelection(row, true);
-      this.selectData = row;
+      this.$refs.multipleTable.clearSelection()
+      if (selection.length == 0) return
+      this.$refs.multipleTable.toggleRowSelection(row, true)
+      this.selectData = row
     },
     handleClose1() {
       this.dialogVisible = false
     },
-    opProduct(){
+    opProduct() {
       this.dialogVisible = true
     },
     getProduct() {
       api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
-        this.productList = res.rows;
+        this.productList = res.rows
         this.total = res.total
-      });
+      })
     },
     getRepurchaseType() {
       api.repurchaseType().then((res) => {
         this.repurchaseTypeList = res.data
       })
       supply.supplierList().then((res) => {
-        this.supplierList = res.rows;
-      });
+        this.supplierList = res.rows
+      })
     },
     getProductCode() {
       api.getProductCode().then((res) => {
@@ -742,7 +879,7 @@ export default {
         this.$set(this.form, 'ysList', [
           res.data.isLandTrans == 0 ? 1 : '',
           res.data.isAirTrans == 0 ? 2 : '',
-          res.data.isOceanTrans == 0 ? 3 : '',
+          res.data.isOceanTrans == 0 ? 3 : ''
         ])
         // this.form.checkList = this.form.pkSpecsType
         this.$set(this.form, 'checkList', this.form.pkSpecsType)
@@ -754,6 +891,9 @@ export default {
             }
           })
         })
+        if (!this.form.wmsCode) {
+          this.$set(this.form, 'wmsCode', this.form.productCode)
+        }
         if (this.wahtMethods == 2) {
           this.getProductCode()
         }
@@ -775,7 +915,7 @@ export default {
           this.$set(this.form, 'ysList', [
             res.data.isLandTrans == 0 ? 1 : '',
             res.data.isAirTrans == 0 ? 2 : '',
-            res.data.isOceanTrans == 0 ? 3 : '',
+            res.data.isOceanTrans == 0 ? 3 : ''
           ])
           // this.form.checkList = this.form.pkSpecsType
           this.$set(this.form, 'checkList', this.form.pkSpecsType)
@@ -898,7 +1038,7 @@ export default {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: 'success',
+                type: 'success'
               })
               this.$router.go(-1)
             }
@@ -916,11 +1056,11 @@ export default {
       this.noneUploadImg = fileList.length > 0
       this.$refs.form.clearValidate('cover')
     },
-    //图片上传成功后的回调
+    // 图片上传成功后的回调
     handlePictureSuccess(res, file) {
       this.form.cover = res.data.url
     },
-    //图片上传删除
+    // 图片上传删除
     handleRemove(file, fileList) {
       this.form.cover = ''
       this.noneUploadImg = fileList.length > 0
@@ -932,8 +1072,8 @@ export default {
         return 'success-row'
       }
       return ''
-    },
-  },
+    }
+  }
 }
 </script>
 <style scoped lang="scss">