1

src/apis/service/orderEntry/orderConfirm/index.js

@@ -0,0 +1,17 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+    // 添加
+    add: (data, params) => http(api + "brandcreate", data, "post", params),
+    // 删除
+    delete: (data, params) => http(api + "branddel", data, "post", params),
+    // 分页查询
+    list: (data, params) => http(api + "brandlist", data, "post", params),
+    // 更新
+    update: (data, params) => http(api + "brandedit", data, "post", params),
+    // 修改状态
+    status: (data, params) => http(api + 'brandstatus', data, 'post', params),
+    // 详情
+    detail: (data, params) => http(api + "orderimportinfo", data, "post", params),
+};

src/apis/service/orderEntry/orderEnter/index.js

@@ -0,0 +1,17 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+    // 添加
+    add: (data, params) => http(api + "brandcreate", data, "post", params),
+    // 删除
+    delete: (data, params) => http(api + "branddel", data, "post", params),
+    // 分页查询
+    list: (data, params) => http(api + "orderimportlist", data, "post", params),
+    // 更新
+    update: (data, params) => http(api + "brandedit", data, "post", params),
+    // 修改状态
+    status: (data, params) => http(api + 'brandstatus', data, 'post', params),
+    // 详情
+    detail: (data, params) => http(api + "orderimportinfo", data, "post", params),
+};

src/views/orderEntry/orderConfirm/index.vue

@@ -1,106 +1,203 @@
 <template>
-  <div class="box">
-      <h1>C端订单确认</h1>
-      <ul>
-        <li class="tbHead">
-          <div class="tbTitle">字段</div>
-          <div class="tbTitle">导入字段</div>
-          <div class="tbTitle">解析字段</div>
-          <div class="tbTitle">订单确认字段</div>
-        </li>
-        <li v-for="(item,index) in table" :key="index">
-          <div>{{item.name}}</div>
-          <div></div>
-          <div></div>
-          <div></div>
-        </li>
-      </ul>
+  <div class="orderConfirm pagePadding">
+    <div
+      style="width: 100%"
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+    >
+      <!-- <div
+        class="detail-page-title"
+        v-if="status === '1' && powers.some((item) => item == '082')"
+      >
+        <span>采购单编号：</span><span>{{ queryId }} </span>
+        <tolerance
+          :newTime="newTime"
+          v-if="newTime !== ''"
+          :sitem="sitem"
+          :showBtn="status === '1' && powers.some((item) => item == '082')"
+        />
 
-      <div class="btn">
-            <el-button type="primary">提交</el-button>
-          <el-button>取消</el-button>
-      </div>
+       
+      </div> -->
+      <el-tabs v-model="activeTabs">
+        <el-tab-pane label="业务详情" name="1">
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="采购单信息" name="1">
+              11
+            </el-collapse-item>
+            <el-collapse-item title="商品信息" name="2"> 11 </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
+        <el-tab-pane label="审批记录" name="2">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'CGD'"
+            :orderCode="queryId"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
   </div>
 </template>
+   <script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/orderEntry/orderConfirm";
 
-<script>
 export default {
-  data(){
+  name: "orderConfirm",
+  mixins: [mixinPage, resToken],
+
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "orderConfirm"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
     return {
-      table:[
-        {name:"平台订单号",},
-        {name:"平台订单下单时间",},
-        {name:"平台商品编号",},
-        {name:"业务公司信息",},
-        {name:"企业客户信息",},
-        {name:"供应商信息",},
-        {name:"所在平台",},
-        {name:"销售渠道",},
-        {name:"商品名称-商品信息",},
-        {name:"订单单价",},
-        {name:"销售数量",},
-        {name:"订单总金额",},
-        {name:"活动名称",},
-        {name:"优惠金额",},
-        {name:"优惠后的金额",},
-        {name:"优惠原因-用活动名称",},
-        {name:"收费模式",},
-        {name:"订单备注",},
-        {name:"收货人",},
-        {name:"联系电话",},
-        {name:"联系地址",},
-        {name:"联系地址省市区",},
-      ]
-    }
-  }
-}
-</script>
+      hasdiff: false,
+      activeTabs: "1",
+      isMetal: false,
+      finishStatus: "finish",
+      activeNames: ["0", "1", "2", "3", "4", "5", "10"],
+      sitem: null,
+      status: "",
+      newTime: "",
+      loading: false,
+      queryId: "",
+      ReturnAddModel: false, //采购单退货弹窗
+    };
+  },
+  mounted() {
+    this.queryId = this.$route.query.id;
+    this.initData();
+  },
+  methods: {
+    //导出文件 （需要修改）
+    download() {
+      if (!this.loading) {
+        this.loading = true;
+        // let httpType = `aplication/zip`;
+        let model = {};
+        axios({
+          method: "post",
+          url: this.fileUrl + "admin/checkexport",
+          responseType: "blob",
+          data: model,
+          // headers: {
+          //   Accept: httpType,
+          // },
+        })
+          .then((res) => {
+            if (res && res.status == 200 && res.data) {
+              let url = window.URL.createObjectURL(
+                new Blob([res.data], {
+                  type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
+                })
+              );
+              let link = document.createElement("a");
+              link.style.display = "none";
+              link.href = url;
+              let excelName = "测试.xlsx";
+              link.setAttribute("download", excelName);
+              document.body.appendChild(link);
+              link.click();
+              link.remove();
+              window.URL.revokeObjectURL(url); //释放掉blob对象
+              this.$message.success(`${message}导出成功！`);
+              setTimeout(() => {
+                this.loading = false;
+              }, 500);
+            } else {
+              this.$message.error(res.data.message);
+              setTimeout(() => {
+                this.loading = false;
+              }, 500);
+            }
+          })
+          .catch((error) => {
+            console.log(error);
+            this.loading = false;
+          });
+      }
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
 
-<style lang="scss" scoped>
-  .box{
-    width: 100%;
-    color: #666;
-    h1{
-        margin: 20px 0 40px 20px;
-        font-size: 26px;
-        color: #333;
-    }
-    ul{
-      width: 80%;
-      height: 70vh;
-      margin: 0 auto 20px;
-      overflow-y: scroll;
-      // position: relative;
-      li{
-        display: flex;
-        width: 100%;
+    async examForm(e) {
+      if (!this.loading) {
+        let type = e.state === "1" ? "2" : "0";
+        await this.setStatus(type, "提交入库方审核", e.remark);
       }
-      .tbHead{
-        position: sticky;
-        z-index: 1;
-        top: 0;
-        background: #f7f7f7;
-      .tbTitle{
-          height: 48px;
-          font-weight: bold;
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ id: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        const { status, can, cgdNo } = this.sitem;
+        this.status = status;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
         }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
       }
-      li div{
-        width: 25%;
-        border: 1px solid #ddd;
-        border-collapse: collapse;
-        height: 42px;
-        display: flex;
-        align-items: center;
-        padding-left: 10px;
-        box-sizing: border-box;
-      }
-    }
-    .btn{
-    width: 50%;
-    margin: auto ;
-    display: flex;
-    justify-content: space-around;
+      this.loading = false;
+    },
+    async statusConfirm() {
+      await this.$confirm(`确定已与供应商确认？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          let model = {
+            cgdNo: this.sitem.cgdNo,
+            status: "1",
+          };
+          const res = await asyncRequest.status(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "提交成功！",
+              message: "",
+            });
+            await this.initData();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.orderConfirm {
 }
-  }
 </style>
+   
+   

src/views/orderEntry/orderEnter/columns.js

@@ -1,69 +1,530 @@
-const listCol = [{
-    type: "selection",
-    fixed: "left",
-    _noset_: true
+
+//是否定制
+const options1 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+//专属类型
+const options2 = [
+  { id: "0", name: "非泰康" },
+  { id: "1", name: "泰康" },
+]
+//销售权限
+const options3 = [
+  { id: "0", name: "无销售权限" },
+  { id: "1", name: "有销售权限" },
+]
+
+//是否库存品
+const options4 = [
+  { id: "0", name: "非库存品" },
+  { id: "1", name: "库存品" },
+]
+//是否启用实时金价
+const options5 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+//供货区域
+const options6 = [
+  { id: "1", name: "全国" },
+  { id: "2", name: "全国除偏远" },
+]
+//是否启用阶梯
+const options7 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+
+//有无工差
+const options8 = [
+  { id: "0", name: "无工差" },
+  { id: "1", name: "有工差" },
+]
+//配置要求
+const options9 = ["证书", "包装盒", "绒布袋", "标签", "其他"]
+const statusList = [
+  {
+    code: "0",
+    name: "新建待审核",
+    type: "",
   },
   {
-    prop: "",
-    label: "订单编号",
-    width: "160px",
+    code: "1",
+    name: "审核通过",
+    type: "success",
   },
   {
-    prop: "",
-    label: "供应商编码",
-    width: "160px",
+    code: "2",
+    name: "基础修改待审核",
+    type: "",
   },
   {
-    prop: "",
-    label: "供应商名称",
-    width: "160px",
+    code: "3",
+    name: "成本修改待审核",
+    type: "",
   },
   {
-    prop: "",
-    label: "业务公司编号",
-    width: "160px",
+    code: "4",
+    name: "基础修改驳回",
+    type: "danger",
   },
   {
-    prop: "",
-    label: "业务公司名称",
-    width: "160px",
+    code: "5",
+    name: "成本修改驳回",
+    type: "danger",
   },
   {
-    prop: "",
-    label: "商品编码",
-    width: "160px",
+    code: "6",
+    name: "新建审核驳回",
+    type: "danger",
   },
   {
-    prop: "",
-    label: "商品名称",
-    width: "160px",
+    code: "7",
+    name: "复制商品待编辑",
+    type: "info",
   },
   {
-    prop: "",
-    label: "平台商品编号",
+    code: "8",
+    name: "咨询商品待编辑",
+    type: "info",
+  },
+]
+const listCol = [
+  { type: "selection", fixed: "left", _noset_: true },
+  {
+    prop: "spuCode",
+    label: "编号",
     width: "160px",
   },
   {
-    prop: "",
-    label: "单位",
-    width: "60px",
+    prop: "good_thumb_img",
+    label: "图片",
+    _slot_: "good_thumb_img",
+    width: "45px",
   },
   {
-    prop: "",
-    label: "录入状态",
-    width: "120px",
+    prop: "good_name",
+    label: "名称",
+    "min-width": "160px",
+  },
+  {
+    prop: "cat_name",
+    label: "分类",
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+  },
+  {
+    prop: "isonline",
+    label: "是否上线",
+    _slot_: "isonline",
+    width: "70px",
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "118px",
+  },
+  {
+    prop: "supplierNo",
+    label: "供应商编号",
+    width: "110px",
+  },
+  {
+    prop: "supplier_name",
+    label: "供应商名称",
+    width: "110px",
+  },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "110px",
+  },
+  {
+    prop: "company",
+    label: "业务公司名称",
+    width: "110px",
+  },
+  {
+    prop: "creater",
+    label: "创建人",
+    width: "70px",
   },
 
+
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "140px",
+  },
   {
     prop: "",
     label: "操作",
     fixed: "right",
-    // _noset_: true,
-    width: "80px",
+    _noset_: true,
+    width: "50px",
     _slot_: "operation",
   },
 ]
+const validate_num = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value === "") {
+    callback(new Error("不能为空！"));
+  } else {
+    callback();
+  }
+};
+const validate_num_0 = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value === "") {
+    callback(new Error("不能为空！"));
+  } else if (required && (value === "0" ||
+    value === "0." ||
+    value === "0.0" ||
+    value === "0.00" ||
+    value === "0.000"
+  )) {
+    callback(new Error("不能为零！"));
+  } else {
+    callback();
+  }
+};
+const validate_good_img = (rule, value, callback) => {
+  const { required } = rule
+  if (required && value.length == 0) {
+    callback(new Error("请上传商品主图！"));
+  } else if (required && (value.length < 3 || value.length > 10)) {
+    callback(new Error("商品主图应为3~10张！"));
+  } else {
+    callback();
+  }
+};
+const rules = {
+  cat_id: [
+    {
+      type: "array",
+      required: true,
+      message: "请选择商品分类",
+      trigger: "change",
+    },
+  ],
+  brandid: [
+    {
+      type: "array",
+      required: true,
+      message: "请选择商品品牌",
+      trigger: "change",
+    },
+  ],
+  noble_weight: [
+    {
+      required: true,
+      validator: validate_num_0,
+      trigger: "blur",
+    },
+  ],
+  weight: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+  good_type: [
+    {
+      required: true,
+      message: "请选择是否定制",
+      trigger: "change",
+    },
+  ],
+  is_stock: [
+    {
+      required: true,
+      message: "请选择是否库存品",
+      trigger: "change",
+    },
+  ],
+  company_id: [
+    {
+      required: true,
+      message: "请选择业务公司",
+      trigger: "change",
+    },
+  ],
+  supplierNo: [
+    {
+      type: "array",
+      required: true,
+      message: "请选择供应商",
+      trigger: "change",
+    },
+  ],
+  is_auth: [
+    {
+      required: true,
+      message: "请选择是否有权限销售",
+      trigger: "change",
+    },
+  ],
+  tax: [
+    {
+      required: true,
+      message: "请选择税率",
+      trigger: "change",
+    },
+  ],
+  good_name: [
+    {
+      required: true,
+      message: "请输入商品名称",
+      trigger: "blur",
+    },
+  ],
+  unit: [
+    {
+      type: "array",
+      required: true,
+      message: "请输入商品单位",
+      trigger: "blur",
+    },
+  ],
+  is_exclusive: [
+    {
+      required: true,
+      type: "array",
+      message: "请选择专属类型",
+      trigger: "change",
+    },
+  ],
+  noble_metal: [
+    {
+      required: true,
+      message: "请选择贵金属种类",
+      trigger: "change",
+    },
+  ],
+  is_gold_price: [
+    {
+      required: true,
+      message: "请选择是否启用实时金价",
+      trigger: "change",
+    },
+  ],
+  moq: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+  customized: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+  after_sales: [
+    {
+      required: true,
+      message: "售后说明不能为空",
+      trigger: "blur",
+    },
+  ],
+  good_remark: [
+    {
+      required: true,
+      message: "商品备注不能为空",
+      trigger: "blur",
+    },
+  ],
+  //包装/发货/图片
+  packing_list: [
+    {
+      required: true,
+      message: "请输入包装清单",
+      trigger: "blur",
+    },
+  ],
+  packing_way: [
+    {
+      required: true,
+      message: "请输入包装方式",
+      trigger: "blur",
+    },
+  ],
+
+  packing_spec: [
+    {
+      required: true,
+      message: "请输入装箱规格",
+      trigger: "blur",
+    },
+  ],
+  packing_weight: [
+    {
+      required: true,
+      message: "请输入装箱重量",
+      trigger: "blur",
+    },
+  ],
+  packing_szie: [
+    {
+      required: true,
+      message: "请输入装箱尺寸",
+      trigger: "blur",
+    },
+  ],
+  supply_area: [
+    {
+      required: true,
+      message: "请选择供货区域",
+      trigger: "change",
+    },
+  ],
+  delivery_place: [
+    {
+      type: "array",
+      required: true,
+      message: "请选择发货地",
+      trigger: "change",
+    },
+  ],
+  origin_place: [
+    {
+      type: "array",
+      required: true,
+      message: "请选择产地",
+      trigger: "change",
+    },
+  ],
+  delivery_day: [
+    {
+      required: true,
+      message: "请输入物流时间",
+      trigger: "blur",
+    },
+  ],
+  lead_time: [
+    {
+      required: true,
+      message: "请输入供货周期",
+      trigger: "blur",
+    },
+  ],
+  sample_day: [
+    {
+      required: true,
+      message: "请输入调样周期",
+      trigger: "blur",
+    },
+  ],
+  packing_size: [
+    {
+      required: true,
+      message: "请输入装箱尺寸",
+      trigger: "blur",
+    },
+  ],
+  good_size: [
+    {
+      required: true,
+      message: "请输入商品尺寸",
+      trigger: "blur",
+    },
+  ],
+  good_thumb_img: [
+    {
+      required: true,
+      message: "请上传商品缩略图",
+      trigger: "change",
+    },
+  ],
+  good_img: [
+    {
+      type: "array",
+      required: true,
+      validator: validate_good_img,
+      trigger: "change",
+    },
+  ],
+  good_info_img: [
+    {
+      type: "array",
+      required: true,
+      message: "至少上传一张商品详情介绍图",
+      trigger: "change",
+    },
+  ],
 
-export {
-  listCol
+
+
+  demo_fee: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+  is_diff: [
+    {
+      required: true,
+      message: "请选择有无工差",
+      trigger: "change",
+    },
+  ],
+  config: [
+    {
+      required: true,
+      type: 'array',
+      message: "请选择配置要求",
+      trigger: "change",
+    },
+  ],
+  other_config: [
+    {
+      required: true,
+      message: "其他要求不能为空",
+      trigger: "blur",
+    },
+  ],
+  open_fee: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+  sample_fee: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+  market_price: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+
+  cgd_gold_price: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+  // is_step: {
+  //   required: true,
+  //   message: "请选择是否启用阶梯",
+  //   trigger: "change",
+  // },
 }
+
+export { options1, options2, options3, options4, options5, options6, options7, options8, options9, listCol, rules, statusList }

src/views/orderEntry/orderEnter/index.vue

@@ -1,97 +1,14 @@
 <template>
-  <div class="box">
-    <div class="searchBox">
-      <el-form
-        ref="form"
-        :model="ruleForm"
-        label-width="80px"
-        size="medium "
-        class="form"
-      >
-        <el-row>
-          <el-col :span="7">
-            <el-form-item label="销售方" prop="cs1" label-width="100px">
-              <el-select
-                v-model="ruleForm.cs1"
-                style="width: 100%"
-                placeholder="咨询类型"
-              >
-                <el-option
-                  v-for="item in cs1Arr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="平台订单号" prop="cs2" label-width="110px">
-              <el-input
-                v-model="ruleForm.cs2"
-                placeholder="平台订单号"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="平台下单时间" prop="cs3" label-width="120px">
-              <period-date-picker
-                :start="ruleForm.start1"
-                :end="ruleForm.end1"
-                :width="'130px'"
-                :size="searchSize"
-                @timeReturned="handleTime"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="PO编号" prop="cs4" label-width="100px">
-              <el-input v-model="ruleForm.cs4" placeholder="PO编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="平台商品编号" prop="cs5" label-width="110px">
-              <el-input
-                v-model="ruleForm.cs5"
-                placeholder="平台商品编号"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="导入时间" prop="cs6" label-width="120px">
-              <period-date-picker
-                :start="ruleForm.start2"
-                :end="ruleForm.end2"
-                :width="'130px'"
-                :size="searchSize"
-                @timeReturned="handleTime"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="rightBtn">
-        <el-button type="primary" icon="el-icon-search" class="btn"
-          >批量关联库存</el-button
-        >
-        <el-button type="primary" icon="el-icon-search" class="btn"
-          >搜索</el-button
-        >
-        <el-button type="primary" icon="el-icon-download" class="btn"
-          ><a href="./static/C端订单导入模板.xlsx">下载导入模板</a></el-button
-        >
-        <el-button icon="el-icon-refresh-right" class="btn">重置</el-button>
-      </div>
-    </div>
-    <div class="tableBox">
-      <ex-table
-        :table="table"
-        :data="tableData"
-        :columns="columns"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
+  <div class="goodsCost pagePadding">
+    <ex-table
+      v-loading="loading"
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      :table="table"
+      :data="tableData"
+      :columns="columns"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
       @page-size-change="handleSizeChange"
       @screen-reset="
         pageInfo.curr = 1;
@@ -104,154 +21,582 @@
         searchList();
       "
       @selection="selection_change"
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 10px 80px">
+            <el-col :span="6" style="width: 303px">
+              <period-date-picker
+                :type="1"
+                :width="'135px'"
+                :size="searchSize"
+                :start="parmValue.start"
+                :end="parmValue.end"
+                @timeReturned="handleTime"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 135px">
+              <search-brand
+                :value="brandid"
+                :disabled="false"
+                :size="'mini'"
+                :isDetail="false"
+                :names="''"
+                :placeholder="'商品品牌'"
+                @searchChange="brandidsearchChange"
+              />
+            </el-col>
+            <el-col :span="6" style="width: 310px; padding: 0 0 0 10px">
+              <good-class
+                :value="parmValue.cat_id"
+                @handleChange="goods_class_change"
+                :disabled="false"
+                :size="searchSize"
+                :isDetail="false"
+                :placeholder="'分类'"
+              />
+            </el-col>
+
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 66px; padding: 0 0 0 10px"
+            >
+              <el-button type="primary" :size="searchSize" @click="searchList">
+                刷新
+              </el-button>
+            </el-col>
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 66px; padding: 0 0 0 10px"
+            >
+              <el-button type="warning" :size="searchSize" @click="restSearch">
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" style="width: 226px">
+              <el-select
+                v-model="parmValue.status"
+                filterable
+                clearable
+                :size="searchSize"
+                placeholder="状态"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in statusList"
+                  :key="'status' + item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4" style="width: 145px; padding: 0 0 0 10px">
+              <el-select
+                v-model="parmValue.isonline"
+                filterable
+                clearable
+                :size="searchSize"
+                placeholder="是否上线"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in isonlineoptions"
+                  :key="'isonline' + item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4" style="width: 420px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="sinput"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="关键字"
+                ><el-select
+                  v-model="select"
+                  slot="prepend"
+                  style="width: 135px"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                  placeholder="关键字类型"
+                >
+                  <el-option label="商品编号" value="1" />
+                  <el-option label="商品名称" value="2" />
+                  <el-option label="业务企业编号" value="3" />
+                  <el-option label="供应商编号" value="4" /> </el-select
+              ></el-input>
+            </el-col>
+
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 66px; padding: 0 0 0 10px"
+              v-if="powers.some((item) => item == '003')"
+            >
+              <el-button
+                :size="searchSize"
+                type="success"
+                style="float: right"
+                @click="
+                  routeGoto('goodsCostDetail', { id: 'add', type: 'add' })
+                "
+              >
+                添加
+              </el-button>
+            </el-col>
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 110px; padding: 0 0 0 10px"
+              v-if="powers.some((item) => item == '055')"
+            >
+              <el-button
+                :size="searchSize"
+                type="warning"
+                style="float: right"
+                @click="add_online"
+              >
+                <i class="el-icon-circle-plus-outline"></i>
+                <span>商品上线</span>
+              </el-button>
+            </el-col>
+          </el-row>
+        </div></template
       >
-        <template #operation="{ scope }">
-          <el-tooltip
-            v-if="powers.some((item) => item == '007')"
-            effect="dark"
-            content="详情"
-            placement="top"
-          >
-            <i
-              class="el-icon-view tb-icon"
-              @click="
-                routeGoto('goodsCostDetail', {
-                  id: scope.row.spuCode,
-                  type: 'view',
-                })
-              "
-            ></i>
-          </el-tooltip>
 
-          <el-tooltip
-            v-if="
-              (powers.some((item) => item == '054') &&
-                scope.row.status === '1') ||
-              (powers.some((item) => item == '054') && scope.row.status === '4')
+      <template #good_thumb_img="{ scope }">
+        <div
+          v-if="scope.row.good_thumb_img"
+          style="width: 20px; height: 20px"
+          class="hover"
+          v-viewer
+        >
+          <img
+            :src="scope.row.good_thumb_img"
+            style="display: inline-block; width: 100%; height: 100%"
+            alt=""
+          />
+        </div>
+      </template>
+      <template #status="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="
+            (statusList.find((item) => item.code == scope.row.status) || {})
+              .type || '--'
+          "
+          v-text="
+            (statusList.find((item) => item.code == scope.row.status) || {})
+              .name || '--'
+          "
+        ></el-tag>
+      </template>
+      <template #isonline="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.is_online == '0' ? 'warning' : ''"
+          v-text="
+            (
+              isonlineoptions.find((item) => item.id == scope.row.is_online) ||
+              {}
+            ).name || '--'
+          "
+        ></el-tag>
+      </template>
+
+      <template #operation="{ scope }">
+        <el-tooltip
+          effect="dark"
+          content="详情"
+          placement="top"
+        >
+          <i
+            class="el-icon-view tb-icon"
+            @click="
+              routeGoto('orderConfirm', {
+                id: scope.row.id,
+                type: 'view',
+              })
             "
-            effect="dark"
-            content="修改基础信息"
-            placement="top"
-          >
-            <i
-              class="el-icon-c-scale-to-original tb-icon"
-              @click="
-                wantto(
-                  scope.row.is_online,
-                  scope.row.spuCode,
-                  scope.row.status,
-                  '2'
-                )
-              "
-            ></i>
-          </el-tooltip>
-        </template>
-      </ex-table>
-    </div>
+          ></i>
+        </el-tooltip>
+      </template>
+    </ex-table>
+    <no-auth v-else></no-auth>
+    <add-edit
+      :id="''"
+      :sitem="changeList"
+      :show-model="showModel"
+      :is-detail="false"
+      @refresh="showModel = false"
+      @cancel="showModel = false"
+    />
   </div>
 </template>
-
 <script>
-import { listCol } from "./columns";
+import asyncRequest from "@/apis/service/orderEntry/orderEnter";
+import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
+import resToken from "@/mixins/resToken";
+import { listCol, options1, statusList } from "./columns";
+// import addEdit from "./components/addEdit";
 export default {
+  name: "goodsCost",
+  mixins: [mixinPage, resToken],
+  // components: {
+  //   addEdit,
+  // },
+  computed: {
+    //组件SIZE设置
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "orderEnter"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
   data() {
     return {
-      cs1Arr: [
-        { value: "0", label: "一地" },
-        { value: "1", label: "多地" },
+      statusList,
+      isonlineoptions: [
+        { id: "0", name: "未上线" },
+        { id: "1", name: "已上线" },
       ],
-      ruleForm: {
-        cs1: "",
-        cs2: "",
-        cs3: "",
-        cs4: "",
-        cs5: "",
-        cs6: "",
-        end1: "",
-        start1: "",
-        end2: "",
-        start2: "",
-      },
+      showModel: false,
+      options1: options1,
+      loading: false,
       changeList: [],
+      parmValue: {
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        start: "",
+        end: "",
+        status: "",
+        good_name: "",
+        spucode: "",
+        cat_id: [],
+        brandid: "",
+        good_type: "",
+        companyNo: "",
+        supplierNo: "",
+        isonline: "",
+        // creater: "",
+      },
+      sinput: "",
+      select: "",
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
         total: 0,
       },
-      table: {
-        stripe: true,
-        border: true,
-      },
-      tableData: [],
+      // 表格 - 列参数
       columns: listCol,
-      
+      supplierNo: [],
+      brandid: [],
     };
   },
-  computed: {
-    //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  mounted() {
+    this.select = "1";
+    this.supplierNo = [];
+    this.brandid = [];
+    this.searchList();
   },
   methods: {
-    async handleTime(e) {
-      console.log(this.ruleForm.start);
-      console.log(this.ruleForm.end);
-      // this.ruleForm.start = e.startTime || "";
-      // this.ruleForm.end = e.endTime || "";
-      // if (
-      //   (this.ruleForm.start !== "" && this.ruleForm.end !== "") ||
-      //   (this.ruleForm.start === "" && this.ruleForm.end === "")
-      // ) {
-      //   this.pageInfo.curr = 1;
-      //   this.ruleForm.page = 1;
-      //   // await this.searchList();
-      // }
+    restSearch() {
+      this.select = "1";
+      this.supplierNo = [];
+      this.brandid = [];
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.parmValue = {
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        start: "",
+        end: "",
+        status: "",
+        good_name: "",
+        spucode: "",
+        cat_id: [],
+        brandid: "",
+        good_type: "",
+        isonline: "",
+        companyNo: "",
+        supplierNo: "",
+      };
+      this.searchList();
     },
-    searchList(){
-      alert(11)
+    wantto(isonline, code, ntype, wtype) {
+      console.log(isonline);
+      if (isonline + "" === "1") {
+        this.$message.warning("已上线的商品需要下线才能修改！");
+        return;
+      }
+      if (ntype === "0") {
+        this.$message.warning("新建商品成正在审核中,请审核结束后再修改！");
+        return;
+      }
+      if (ntype === "2") {
+        if (wtype === "2") {
+          this.$message.warning("商品基础信息已修改,请等待审核结果！");
+          return;
+        }
+        if (wtype === "3") {
+          this.$message.warning(
+            "商品基础信息修改流程正在审核中,请审核结束后再修改！"
+          );
+          return;
+        }
+      }
+      if (ntype === "3") {
+        if (wtype === "3") {
+          this.$message.warning("商品成本信息已修改,请等待审核结果！");
+          return;
+        }
+        if (wtype === "2") {
+          this.$message.warning(
+            "商品成信息修改流程正在审核中,请审核结束后再修改！"
+          );
+          return;
+        }
+      }
+      console.log(ntype + "----" + wtype);
+      this.routeGoto("goodsCostDetail", {
+        id: code,
+        type: wtype === "2" ? "editBase" : wtype === "3" ? "editCoin" : "",
+      });
     },
-
     selection_change(e) {
       const { list } = e;
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
+    //商品品牌选择
+    async brandidsearchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.brandid = [id];
+      } else {
+        this.brandid = [];
+      }
+      this.parmValue.brandid = this.brandid.toString();
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
+    },
+    // 时间
+    async handleTime(e) {
+      this.parmValue.start = e.startTime || "";
+      this.parmValue.end = e.endTime || "";
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end !== "") ||
+        (this.parmValue.start === "" && this.parmValue.end === "")
+      ) {
+        this.pageInfo.curr = 1;
+        this.parmValue.page = 1;
+        await this.searchList();
+      }
+    },
+    async good_copy(spuCode) {
+      await this.$confirm(`确定要复制该商品？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            spuCode: spuCode,
+          };
+          const res = await asyncRequest.copy(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "复制商品成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    /**
+     * 启用/禁用
+     * @param {String} id id
+     * @param {String} status 0-禁用 1-启用
+     */
+    async changeStatus(id, status) {
+      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            id: id,
+            status: status === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "状态修改成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async deleteItem(code) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            codes: [code],
+          };
+          const res = await asyncRequest.delete(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    // 刷新表格
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.loading = true;
+      this.parmValue.spucode = this.select === "1" ? this.sinput : "";
+      this.parmValue.good_name = this.select === "2" ? this.sinput : "";
+      this.parmValue.companyNo = this.select === "3" ? this.sinput : "";
+      this.parmValue.supplierNo = this.select === "4" ? this.sinput : "";
+      let item = JSON.parse(JSON.stringify(this.parmValue));
+      item.cat_id =
+        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
+      const res = await asyncRequest.list(item);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.tableData.forEach((a) => {
+          a.cat_name = "";
+          let list = a.cat_info || [];
+          list.forEach((b, i) => {
+            a.cat_name += i == 0 ? b.name : "/" + b.name;
+          });
+        });
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    //商品分类选择
+    async goods_class_change(e) {
+      this.parmValue.cat_id = e;
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
+    },
+    add_online() {
+      if (this.changeList.length === 0) {
+        this.$message.warning("至少选择一个商品！");
+        return;
+      }
+      if (this.changeList.length > 100) {
+        this.$message.warning("商品数量不能超过100！");
+        return;
+      }
+      let isok = true;
+      this.changeList.forEach((e) => {
+        if (e.status !== "1") {
+          isok = false;
+        }
+      });
+      if (!isok) {
+        this.$message.warning("只有审核通过的商品可以上线！");
+        return;
+      }
+      this.showModel = true;
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.box {
-  width: 100%;
-  padding: 8px 12px 0 10px;
-}
-.searchBox {
-  width: 100%;
-  margin-top: 20px;
-  display: flex;
-}
-.form {
-  width: 80%;
-}
-/deep/ .el-input__inner {
-  height: 36px;
-  line-height: 36px;
-}
-.rightBtn {
-  width: 20%;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-around;
-  .btn {
-    height: 36px;
-    margin-left: 0px;
-    display: flex;
-    align-items: center;
-  }
-}
-.tableBox {
-  width: 100%;
-  margin-top: 20px;
-}
 </style>
-

src/views/orderEntry/orderImport/columns.js

@@ -22,7 +22,7 @@ const columns = [
     width: "140px",
   },
   {
-    prop: "good_code",
+    prop: "plat_code",
     label: "平台商品编号",
     width: "140px",
   },

src/views/orderEntry/orderImport/index.vue

@@ -91,8 +91,8 @@ export default {
         "联系地址"
       ];
       if (head.length !== header.length) {
-        console.log("自定义head长度",head.length)
-        console.log("表格内数据长度：",header.length)
+        // console.log("自定义head长度",head.length)
+        // console.log("表格内数据长度：",header.length)
         this.$message.error("表头与导入模板不匹配！");
         return;
       }
@@ -113,19 +113,17 @@ export default {
       this.tableHeader = header;
       this.tableData = [];
       let list = results;
-      // let tableOk = true;
       this.ruleForm.order_addr = [];
       list.forEach((v1) => {
         
         let b = Object.values(v1);
         
-        // let item = this.get_code(b[3], b[4], b[5]);
         let model = {
           platform_code: b[0] + "",
           po_code: b[1] + "",
           platform_time: b[2] + "",
           sale_source: b[3] + "",
-          good_code: b[4] + "",
+          plat_code: b[4] + "",
           price: b[5] + "",
           num: b[6] + "",
           before_discount_all_price: b[7] + "",
@@ -143,65 +141,9 @@ export default {
         this.tableData.push(model);
       });
 
-      // if (!tableOk) {
-      //   this.$message.error("最晚收货日期不正确，请将表格格式转为文本上传！");
-      // }
-      console.log(this.tableData)
-    },
-    get_code(name1, name2, name3) {
-      let name = "",
-        code = [];
-      if (name1 && name2 && name3) {
-        for (let x in province_list) {
-          if (name1 === province_list[x]) {
-            code.push(x);
-            name += province_list[x];
-            break;
-          }
-        }
-        if (code.length === 1) {
-          for (let y in city_list) {
-            if (name2 === city_list[y]) {
-              code.push(y);
-              name += "/" + city_list[y];
-              break;
-            }
-          }
-        }
-        if (code.length === 2) {
-          for (let z in county_list) {
-            if (name3 === county_list[z]) {
-              code.push(z);
-              name += "/" + county_list[z];
-              break;
-            }
-          }
-        }
-
-        if (code.length === 3) {
-          let str1 = "",
-            str2 = "",
-            isok = false;
-          str1 = code[0].slice(0, 2);
-          str2 = code[1].slice(2, 4);
-          if (
-            code[1].indexOf(str1) === 0 &&
-            code[2].indexOf(str1) === 0 &&
-            code[2].indexOf(str2) == 2
-          ) {
-            isok = true;
-          }
-          if (!isok) {
-            name = "";
-            code = [];
-          }
-        } else {
-          name = "";
-          code = [];
-        }
-      }
-      return { name: name, code: code };
+      
     },
+  
     //取消
     cancel(){
       this.tableData = [];