Merge branch 'company' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into company

src/apis/service/dataCorrection/cgMessage/index.js

@@ -1,10 +1,12 @@
 import http from "@/apis/axios";
 const api = "admin/";
 export default {
+  saleList:(data, params) => http(api + "salelist", data, "post", params),
   // 添加
   add: (data, params) => http(api + "add", data, "post", params),
   // 分页查询
   list: (data, params) => http(api + "cgdlist", data, "post", params),
+  zxlist: (data, params) => http(api + "zixunlist", data, "post", params),
   // 删除
   delete: (data, params) => http(api + "delete", data, "post", params),
   // 详情
@@ -42,4 +44,4 @@ export default {
 
    //获取采购单修改供应商的记录
    cgdgetchangesupplierlist: (data, params) => http(api + "cgdgetchangesupplierlist", data, "post", params),
-}
+}

src/apis/service/dataCorrection/order/index.js

@@ -2,11 +2,16 @@ import http from "@/apis/axios";
 const api = "admin/";
 
 export default {
+  changeinfo: (data, params) => http(api + "dachangeinfo", data, "post", params),
+  changestatus: (data, params) => http(api + "dachangestatus", data, "post", params),
+
+
   list: (data, params) => http(api + "cgdlist", data, "post", params),
   create: (data, params) => http(api + "dachangeadd", data, "post", params),
   // 获取全部账户列表
   accountall: (data, params) => http(api + 'userCompanyBasicList', data, 'post', params),
 
   cgdgetchangesupplierlist: (data, params) => http(api + "dachangelist", data, "post", params),
-  detail: (data, params) => http(api + "cgdinfo", data, "post", params)
+  detail: (data, params) => http(api + "cgdinfo", data, "post", params),
+  saleDetail: (data, params) => http(api + "saleinfo", data, "post", params),
 }

src/components/globalComponents/search-terrace/main.vue

@@ -36,7 +36,8 @@ export default {
     "type",
     "names",
     "is_show",
-    "controlDisabled"
+    "controlDisabled",
+    "platformType"
   ],
   /**
    * 属性集合
@@ -75,6 +76,9 @@ export default {
         this.remoteMethod(this.searchName);
       }
     },
+    platformType() {
+      this.remoteMethod();
+    },
     isDetail: function(val, old) {
       // console.log(val, old, this.isDetail, "2");
       if (val && this.searchName) {
@@ -110,7 +114,14 @@ export default {
       this.selectLoading = true;
       this.options = [];
       this.formValue.is_show = this.is_show || "1";
-      const { code, data, message } = await asyncRequest.list(this.formValue);
+      const { code, data, message } = await asyncRequest.list({
+        ...this.formValue,
+        ...(this.platformType
+          ? {
+              platform_type: this.platformType
+            }
+          : {})
+      });
 
       if (code === 0) {
         const { list } = data;

src/components/globalComponents/show-goods-data-table/main.vue

@@ -679,6 +679,8 @@ export default {
           if (this.sitem && this.sitem.good_info_img) {
             this.sitem.good_info_img = this.sitem.good_info_img.split(",");
           }
+
+          this.$emit("fetch", res);
         } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {

src/views/dataCorrection/customerCorrection/columns.js

@@ -0,0 +1,55 @@
+const columns = [
+  {
+    prop: "code",
+    label: "销售单编号",
+    minWidth: "155"
+  },
+  {
+    prop:'oaCode',
+    label:'OA编号',
+    minWidth:'155'
+  },
+  {
+    prop:'status',
+    label:'状态',
+    _slot_:"status",
+    width:'90px'
+  },
+  {
+    label: "客户公司(修改前)",
+    minWidth: "185",
+    _slot_:"before"
+  },
+  {
+    label: "客户公司(修改后)",
+    minWidth: "185",
+    _slot_:'after'
+  },
+  {
+    prop: "updatetime",
+    label: "修改时间",
+    minWidth: "145"
+  },
+
+  {
+    prop: "apply_name",
+    minWidth: "150px",
+    label: "申请人",
+  },
+  {
+    prop: "createtime",
+    minWidth: "150px",
+    label: "申请时间",
+  },
+  {
+    prop:'操作',
+    label:'操作',
+    width:'60px',
+    _slot_:'operation'
+  }
+]
+
+
+export {
+  columns,
+}

src/views/dataCorrection/customerCorrection/components/_columns.js

@@ -0,0 +1,323 @@
+const columns =  [
+  { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '155px'
+  },
+
+  // {
+  //   prop: "good_code",
+  //   label: "商品编码",
+  //   width:"128"
+  // },
+  {
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    width: '150'
+  },
+  {
+    prop: 'good_class',
+    label: '商品分类',
+    width: '120'
+  },
+  {
+    prop: 'good_num',
+    label: '商品数量',
+    width: '110'
+  },
+  {
+    prop: 'sale_price',
+    label: '销售单价',
+    width: '110'
+  },
+  {
+    prop: 'total_price',
+    label: '总价',
+    width: '110'
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    width: '120px'
+  },
+  {
+    prop: 'use_type',
+    label: '平台类型',
+    _slot_: 'use_type',
+    width: '80'
+  },
+
+  // {
+  //   prop: 'cgd_status',
+  //   label: '采购单状态',
+  //   _slot_: 'cgd_status',
+  //   width: '120px'
+  // },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '100px'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '100px'
+  },
+  // {
+  //   prop: 'useage',
+  //   label: '订单用途',
+  //   width: '100px'
+  // },
+
+  {
+    prop: 'customer_code',
+    label: '客户公司编码',
+    width: '155px'
+  },
+  {
+    prop: 'customerName',
+    label: '企业客户名称',
+    width: '125px'
+  },
+  {
+    prop: 'supplierName',
+    label: '销售方公司',
+    width: '125px'
+  },
+  // {
+  //   prop: "company_name",
+  //   label: "订单创建人部门",
+  //   minWidth: "100px",
+  // },
+
+  {
+    prop: 'apply_name',
+    label: '订单创建人',
+    width: '85px'
+  },
+  {
+    prop: 'cgder',
+    label: '供应商负责人',
+    width: '95'
+  },
+  {
+    prop: 'good_creater',
+    label: '商品创建人',
+    width: '85px'
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    width: '145px'
+  },
+]
+
+
+const ShowDataTableColumns=[
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    span: 6
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    span: 6
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    span: 6
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    span: 6
+  },
+
+  {
+    prop: 'supplierName',
+    label: '销售方公司',
+    _slot_: 'supplierName',
+    span: 12
+  },
+  {
+    prop: 'companyName',
+    label: '购买方公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+
+  {
+    prop: 'platform_name',
+    label: '所属平台',
+    span: 12
+  },
+  {
+    prop: 'apply_name',
+    label: '创建人',
+    span: 6
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'is_active',
+    label: '活动类型',
+    _slot_: 'is_active',
+    span: 12
+  },
+  {
+    prop: 'arrive_time',
+    label: '要求到货时间',
+    span: 6
+  },
+  {
+    prop: 'paytime',
+    label: '承诺付款时间',
+    span: 6
+  },
+
+  {
+    prop: 'good_num',
+    label: '购买数量',
+    span: 4
+  },
+  {
+    prop: 'send_num',
+    label: '已发数量',
+    span: 4
+  },
+  {
+    prop: 'wsend_num',
+    label: '未发数量',
+    span: 4
+  },
+  {
+    prop: 'th_num',
+    label: '退货数量',
+    span: 4
+  },
+
+  {
+    prop: 'sale_price',
+    label: '售价',
+    append: '元',
+    span: 4
+  },
+  {
+    prop: 'total_price',
+    label: '总金额',
+    append: '元',
+    span: 4
+  },
+  {
+    prop: 'returnCode',
+    label: '售后来源单号',
+    span: 6
+  },
+  {
+    prop: 'proof_id',
+    label: '凭证文件',
+    _slot_: 'proof_id',
+    span: 6
+  },
+
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    append: '元',
+    span: 6
+  },
+  {
+    prop: 'send_type',
+    label: '下单方式',
+    _slot_: 'send_type',
+    span: 6
+  },
+
+  {
+    prop: 'useage',
+    label: '订单用途',
+    span: 24
+  },
+
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  },
+
+  {
+    prop: 'platform_order',
+    label: '平台订单号',
+    span: 24
+  },
+  {
+    prop: 'workNo',
+    label: '其他单号',
+    span: 24
+  }
+]
+const statusOptions = [
+  { value: "0", label: "待发货" },
+  { value: "1", label: "待发货完成" },
+  { value: "2", label: "发货已完成" },
+  { value: "3", label: "订单已取消" },
+];
+
+const mianColumns=[
+  {
+    prop: "code",
+    label: "采购单编号",
+    span:  6
+  },
+  {
+    prop: "createtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "creater",
+    label: "创建人",
+    span: 4
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    span: 4
+  },
+  {
+    prop:'status',
+    label:'状态',
+    span: 4,
+    _slot_:'status'
+  },
+  {
+    label:"客户公司(修改前)",
+    span: 12,
+    _slot_:'before'
+  },
+  {
+    label: "客户公司(修改后)",
+    span: 12 ,
+    _slot_:'after'
+  },
+  {
+    prop:'remark',
+    label: "备注",
+    span: 24 ,
+  },
+]
+
+export { columns, statusOptions, ShowDataTableColumns,mianColumns }

src/views/dataCorrection/customerCorrection/components/addEdit.vue

@@ -0,0 +1,504 @@
+<template>
+  <el-dialog
+    title="销售单详情"
+    v-loading="loading"
+    :center="true"
+    align="left"
+    top="2vh"
+    width="1080px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin-top: -20px">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @selection-change="list => selected = list"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{  }">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="6" style="width: 293px; padding: 0 0 0 0px">
+                <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: 148px; padding: 0 0 0 8px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.status"
+                  filterable
+                  clearable
+                  placeholder="订单状态"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in statusOptions"
+                    :key="'status' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
+                <el-switch
+                  v-model="parmValue.use_type"
+                  :active-value="usetypeOtions[1].value"
+                  :inactive-value="usetypeOtions[0].value"
+                  :active-text="usetypeOtions[1].label"
+                  :inactive-text="usetypeOtions[0].label"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  style="float: right; margin-left: 5px"
+                  @click="searchList"
+                >刷新</el-button>
+              </el-col>
+            </el-row>
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="6" style="width: 371px">
+                <search-customer
+                  :value="customerCode"
+                  :size="searchSize"
+                  :names="parmValue.supplierName"
+                  :is-detail="true"
+                  :placeholder="'企业客户'"
+                  @searchChange="customerChange"
+                />
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_source"
+                  filterable
+                  clearable
+                  placeholder="订单来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_source_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_type"
+                  filterable
+                  clearable
+                  placeholder="商品类型"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_type_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="4" style="width: 66px; float: right">
+                <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
+              </el-col>
+              <!-- 暂时注释，下版需要导出 -->
+              <el-col :span="4" style="width: 66px; float: right">
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="submit(selection)"
+                  :size="searchSize"
+                  class="fr"
+                >提交</el-button>
+              </el-col>
+            </el-row>
+
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="6" style="width: 426px">
+                <el-input
+                  clearable
+                  placeholder="关键字"
+                  v-model="input"
+                  maxlength="40"
+                  :size="searchSize"
+                  @blur="searchList"
+                  class="input-with-select"
+                >
+                  <el-select
+                    v-model="select"
+                    style="width: 100px"
+                    slot="prepend"
+                    placeholder="关键字类型"
+                    @change="searchList"
+                  >
+                    <el-option label="订单编号" value="orderCode"></el-option>
+                    <el-option label="商品名称" value="good_name"></el-option>
+                    <el-option label="创建人" value="apply_name"></el-option>
+                    <el-option label="创建人部门" value="company_name"></el-option>
+                  </el-select>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  ></el-button>
+                </el-input>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+        <template #good_name="{ scope }">
+          <span>{{ scope.row.good_name }}</span>
+          <span v-for="(si, i) in scope.row.speclist" :key="si.spec_id + i">
+            <span v-if="i !== 0">-</span>
+            <span v-else>_</span>
+            <span>{{ si.spec_name }}[{{ si.spec_value || si.spec_value_name }}]</span>
+          </span>
+        </template>
+
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{
+            (usetypeOtions.find(({ value }) => value === scope.row.use_type) || {})
+            .label || "---"
+            }}
+          </el-tag>
+        </template>
+
+        <template #cgd_status="{ scope }">
+          <el-tag size="mini">
+            <template v-if="String(scope.row.order_type) === '1'">--</template>
+            <template v-else>
+              {{
+              (
+              purchaseStatusOptions.find(
+              ({ value }) => value === scope.row.cgd_status
+              ) || {}
+              ).label || "---"
+              }}
+            </template>
+          </el-tag>
+        </template>
+
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              '--'
+            "
+          ></el-tag>
+        </template>
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+      </ex-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/dataCorrection/cgMessage";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import resToken from "@/mixins/resToken";
+
+import { columns } from "./_columns";
+import {
+  cg_order_type_options,
+  xs_order_type_options,
+  xs_order_source_options,
+  usetypeOtions
+} from "@/assets/js/statusList";
+
+export default {
+  mixins: [mixinPage, resToken],
+  props: ["showModel"],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"])
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val;
+      if (val) {
+        this.restSearch();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    }
+  },
+  data() {
+    return {
+      usetypeOtions,
+      showModelThis: this.showModel,
+      select: "1",
+      input: "",
+      timeOBJ: {
+        start: "", //起始时间
+        end: "" // 结束时间
+      },
+      options: ["创建时间", "最晚入库时间"],
+      sselect: "创建时间",
+      xs_order_source_options,
+      xs_order_type_options,
+      // 状态
+      statusOptions: [
+        { id: "0", label: "待发货" },
+        { id: "1", label: "待发货完成" },
+        { id: "2", label: "发货已完成" },
+        { id: "3", label: "订单已取消" }
+      ],
+      /* 采购单状态 **/
+      purchaseStatusOptions: [
+        { value: "0", label: "待与供应商确认" },
+        { value: "1", label: "待入库" },
+        { value: "2", label: "部分入库" },
+        { value: "3", label: "入库完成" },
+        { value: "4", label: "已取消订单" }
+      ],
+      cg_order_type_options,
+      selected: [],
+
+      loading: false,
+      showModel: false,
+      parmValue: {
+        use_type: "",
+        order_source: "",
+        order_type: "", //订单来源
+        orderCode: "", //销售订单code
+        apply_name: "", // 申请人
+        good_name: "", // 产品名称
+        good_code: "", // 产品属性编号
+        status: "", //状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        supplierNo: "", //供应商编号
+        customer_code: "", //客户编号
+        start: "", //新建起始时间
+        end: "", // 新建结束时间
+        company_name: "", //创建人部门
+        use_type: "1"
+      },
+      tableData: [],
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"]
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns: columns
+    };
+  },
+
+  methods: {
+    //提交
+    async submit() {
+      if (this.selected.length === 0) {
+        this.$message.warning("至少选择一条销售单！");
+        return;
+      }
+
+      if (this.selected.length != 1) {
+        this.$message.warning("只能选中一条数据！");
+        return;
+      }
+
+      const { id } = this.selected[0];
+      this.showModelThis = false;
+      // 刷新
+      this.$emit("refresh", id || "");
+    },
+
+    restSearch() {
+      this.select = "orderCode";
+      this.input = "";
+      this.customerCode = [];
+      this.parmValue = {
+        order_type: "",
+        orderCode: "", //销售订单code
+        apply_name: "", // 申请人
+        good_name: "", // 产品名称
+        good_code: "", // 产品属性编号
+        status: "", //状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        supplierNo: "", //供应商编号
+        customer_code: "", //客户编号
+        start: "", //新建起始时间
+        end: "", // 新建结束时间
+        company_name: "", //部门
+        use_type: "1"
+      };
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      };
+      this.searchList();
+    },
+    async handleClick(e) {
+      this.sselect = e;
+      this.parmValue.start = e === "创建时间" ? this.timeOBJ.start : "";
+      this.parmValue.end = e === "创建时间" ? this.timeOBJ.end : "";
+      this.parmValue.last_start = e !== "创建时间" ? this.timeOBJ.start : "";
+      this.parmValue.last_end = e !== "创建时间" ? this.timeOBJ.end : "";
+      if (
+        !(
+          (this.timeOBJ.start !== "" && this.timeOBJ.end === "") ||
+          (this.timeOBJ.start === "" && this.timeOBJ.end !== "")
+        )
+      ) {
+        this.parmValue.page = 1;
+        this.pageInfo.curr = 1;
+        await this.searchList();
+      }
+    },
+
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.loading = true;
+      this.parmValue.orderCode = this.select === "orderCode" ? this.input : "";
+      this.parmValue.good_name = this.select === "good_name" ? this.input : "";
+      this.parmValue.apply_name =
+        this.select === "apply_name" ? this.input : "";
+      this.parmValue.company_name =
+        this.select === "company_name" ? this.input : "";
+
+      const res = await asyncRequest.saleList({
+        ...this.parmValue,
+        needRela: true
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.tableData.forEach(v => {
+          v.good_class = "";
+          if (v.can && v.can.length > 0) {
+            v.can.forEach((x, i) => {
+              v.good_class += i === 0 ? x.name : "_" + x.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 handleTime(e) {
+      if (e.startTime !== "") {
+        this.timeOBJ.start = e.startTime;
+      } else {
+        this.timeOBJ.start = "";
+      }
+      if (e.endTime !== "") {
+        this.timeOBJ.end = e.endTime;
+      } else {
+        this.timeOBJ.end = "";
+      }
+      await this.handleClick(this.sselect);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/dataCorrection/customerCorrection/components/correctionForm.vue

@@ -0,0 +1,613 @@
+<template>
+  <component
+    v-model="activeNames"
+    :is="mapComponent[mode].container"
+    label-width="80px"
+    size="mini"
+    :model="ruleForm"
+    :rules="rules"
+    ref="ruleForm"
+    v-loading="loading"
+  >
+    <el-row>
+      <el-collapse-item v-if="mode === 'update'" title="业务详情" name="0">
+        <show-data-table
+          v-if="detail"
+          style="margin: 0; padding: 0"
+          :sitem="detail"
+          :columns="mianColumns"
+        >
+          <template #before>
+            <el-tooltip :content="'客户公司编码 : ' + detail.before.customer_code" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            {{detail.before.customerName}}
+          </template>
+
+          <template #after>
+            <el-tooltip :content="'客户公司编码 : ' + detail.after.customer_code" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            {{detail.after.customerName}}
+          </template>
+
+          <template #status>
+            <el-tag
+              size="mini"
+            >{{(approvalStatusOptions.find(({value}) => value === detail.status) || {}).label || '--'}}</el-tag>
+          </template>
+        </show-data-table>
+      </el-collapse-item>
+
+      <el-row :span="24">
+        <component
+          name="1"
+          :is="mapComponent[mode].item"
+          v-bind="createLabelField('销售订单')"
+          prop="cgdNo"
+        >
+          <el-select
+            style="width:100%"
+            placeholder="选择订单"
+            filterable
+            remote
+            @focus="centerDialogVisible = true"
+            v-if="!sitem"
+          />
+
+          <el-collapse-transition>
+            <div style="display:flex" v-if="sitem">
+              <div>
+                <show-data-table
+                  :newTime="newTime"
+                  :sitem="sitem"
+                  :columns="ShowDataTableColumns"
+                  border
+                >
+                  <template slot="status">
+                    <el-tag
+                      :size="'mini'"
+                      v-text="
+                      (statusOptions.find((item) => item.value == sitem.status) || {})
+                        .label || '--'
+                    "
+                    ></el-tag>
+                  </template>
+                  <template slot="order_type">
+                    <el-tag
+                      :size="'mini'"
+                      v-text="
+                      (
+                        xs_order_type_options.find(
+                          (item) => item.id == sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                    ></el-tag>
+                  </template>
+                  <template slot="order_source">
+                    <el-tag
+                      :size="'mini'"
+                      v-text="
+                      (
+                        xs_order_source_options.find(
+                          (item) => item.id == sitem.order_source
+                        ) || {}
+                      ).label || '--'
+                    "
+                    ></el-tag>
+                  </template>
+
+                  <template slot="supplierName">
+                    <span>{{ sitem.supplierName }}</span>
+                    <el-popover placement="top" width="300" trigger="hover">
+                      <ul>
+                        <li>
+                          <span>销售方公司编号：</span>
+                          <span>{{ sitem.supplierNo }}</span>
+                        </li>
+                      </ul>
+                      <i class="el-icon-warning-outline fr" slot="reference"></i>
+                    </el-popover>
+                  </template>
+
+                  <template slot="companyName">
+                    <span>{{ sitem.companyName }}</span>
+                    <el-popover placement="top" width="300" trigger="hover">
+                      <ul>
+                        <li>
+                          <span>购买方公司编号：</span>
+                          <span>{{ sitem.customer_code }}</span>
+                        </li>
+                      </ul>
+                      <i class="el-icon-warning-outline fr" slot="reference"></i>
+                    </el-popover>
+                  </template>
+                  <template slot="is_active">
+                    <span>{{ sitem.is_activity + "" === "1" ? "参与活动" : "不参与活动" }}</span>
+                    <span v-if="sitem.is_activity + '' === '0'">
+                      /{{
+                      (
+                      goodtype_options.find(
+                      (item) => item.value == sitem.good_type
+                      ) || {}
+                      ).label || "--"
+                      }}
+                    </span>
+                  </template>
+                  <template slot="proof_id">
+                    <el-popover
+                      placement="top"
+                      width="300"
+                      trigger="hover"
+                      v-if="sitem.proof_type === '1'"
+                    >
+                      <video width="275" controls class="fl">
+                        <source :src="sitem.proof_url" type="video/mp4" />
+                        <source :src="sitem.proof_url" type="video/avi" />您的浏览器不支持Video标签。
+                      </video>
+                      <i
+                        class="el-icon-video-camera-solid hover"
+                        style="font-size: 18px"
+                        slot="reference"
+                      ></i>
+                    </el-popover>
+
+                    <img
+                      v-else-if="sitem.proof_type + '' === '2'"
+                      style="width: 28px; height: 28px"
+                      :src="sitem.proof_url"
+                      class="avatar fl hover"
+                      v-viewer
+                    />
+
+                    <a
+                      v-else-if="sitem.proof_type + '' === '3'"
+                      :href="sitem.proof_url"
+                      download="凭证文件"
+                    >点击下载</a>
+                    <span v-else>暂无凭证</span>
+                  </template>
+                  <template slot="send_type">
+                    <el-tag :size="'mini'">
+                      {{
+                      sitem.send_type + "" === "1"
+                      ? "有地址下单"
+                      : sitem.send_type + "" === "2"
+                      ? "无地址下单"
+                      : "--"
+                      }}
+                    </el-tag>
+                  </template>
+                </show-data-table>
+              </div>
+
+              <el-tooltip content="重新选择订单" placement="top" v-if="mode !== 'update'">
+                <i
+                  class="el-icon-circle-close"
+                  size="mini"
+                  type="text"
+                  style="font-size:18px;cursor:pointer;margin-left:10px"
+                  @click="resetOrder"
+                />
+              </el-tooltip>
+            </div>
+          </el-collapse-transition>
+        </component>
+
+        <el-collapse-transition>
+          <component
+            name="2"
+            v-if="sitem"
+            :is="mapComponent[mode].item"
+            v-bind="createLabelField('商品信息')"
+            :style="
+              `
+               margin-top:10px;
+               margin-right:${mode === 'create' ? '30px' : '0px'}
+               `
+            "
+          >
+            <show-goods-data-table
+              :newTime="newTime"
+              v-if="newTime !== ''"
+              :type="sitem.order_type"
+              :skucode="sitem.skuCode"
+              :spucode="sitem.good_code"
+              :iscgd="false"
+              border
+            />
+          </component>
+        </el-collapse-transition>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="客户公司" prop="supplierNo">
+            <search-customer
+              :value="ruleForm.supplierNo"
+              :size="'mini'"
+              :names="ruleForm.supplierName"
+              :isDetail="true"
+              :placeholder="'客户公司'"
+              @searchChange="customerChange"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="OA编号" prop="oaCode">
+            <el-input :disabled="mode === 'update'" placeholder="OA编号" v-model="ruleForm.oaCode" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="mode !== 'update'">
+          <el-form-item label="申请人" prop="uid">
+            <el-select
+              v-model="ruleForm.uid"
+              :disabled="mode === 'update'"
+              multiple
+              remote
+              filterable
+              :multiple-limit="1"
+              clearable
+              placeholder="申请人"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in activeOptions"
+                :key="`touserid` + item.id"
+                :label="item.nickname"
+                :value="item.id"
+              >
+                <span style="float: left">{{ item.nickname }}</span>
+                <span
+                  style="
+                  float: right;
+                  color: #8492a6;
+                  font-size: 13px;
+                  padding: 0 25px 0 0;
+                "
+                >{{ item.role_name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              :disabled="mode === 'update'"
+              type="textarea"
+              placeholder="备注"
+              v-model="ruleForm.remark"
+              maxlength="2000"
+              show-word-limit
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-col :span="24" v-if="mode !== 'update'">
+        <el-button size="mini" class="fr" type="primary" @click="submit">保存</el-button>
+      </el-col>
+
+      <el-row v-else>
+        <el-collapse-item title="待审核" name="4" v-if="detail && Number(detail.status) === 1">
+          <div style="width:600px">
+            <wait-approval @confirm="onUpdateStatus" />
+          </div>
+        </el-collapse-item>
+      </el-row>
+    </el-row>
+
+    <add-edit
+      @refresh="refresh"
+      :showModel="centerDialogVisible"
+      @cancel="centerDialogVisible = false"
+    />
+  </component>
+</template>
+
+<script>
+import addEdit from "./addEdit.vue";
+import { statusOptions, ShowDataTableColumns, mianColumns } from "./_columns";
+import asyncRequest from "@/apis/service/dataCorrection/order";
+import {
+  cg_order_type_options,
+  xs_order_source_options,
+  xs_order_type_options
+} from "@/assets/js/statusList";
+import WaitApproval from "./waitApproval.vue";
+import resToken from "../../../../mixins/resToken";
+import { isnumber } from "../../../../utils/validate";
+
+// const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
+
+const VALID_OA_CODE = function(_1, _2, callback) {
+  const { oaCode } = this.ruleForm;
+  if (!oaCode) {
+    callback(new Error("OA编号不能为空!"));
+  } else {
+    if (!isnumber(oaCode)) {
+      callback(new Error("OA编号必须为纯数字!"));
+    } else if (oaCode.length !== 12) {
+      callback(new Error("OA编号必须为12位!"));
+    } else {
+      callback();
+    }
+  }
+};
+
+const VALID_SUPPLIER = function(_1, _2, callback) {
+  const { isArray } = Array;
+  const { supplierNo } = this.ruleForm;
+  if (
+    (isArray(supplierNo) && !supplierNo[0]) ||
+    (!isArray(supplierNo) && !supplierNo)
+  ) {
+    callback(new Error("请选择客户公司!"));
+  } else {
+    if (supplierNo[0] === this.sitem.customer_code) {
+      callback(new Error("修改的客户公司不能与销售单原客户公司一致!"));
+    } else {
+      callback();
+    }
+  }
+};
+
+export default {
+  mixins: [resToken],
+  components: { addEdit, WaitApproval },
+  computed: {
+    mode() {
+      return this.$route.query.mode || "create";
+    },
+    id() {
+      return this.$route.query.id || "";
+    }
+  },
+  data() {
+    const binded_valid_oa_code = VALID_OA_CODE.bind(this);
+    const binded_valid_supplier = VALID_SUPPLIER.bind(this);
+
+    return {
+      activeNames: ["1", "2", "3", "4"],
+      mianColumns,
+      detail: null,
+      mapComponent: {
+        create: {
+          container: "ElForm",
+          item: "ElFormItem",
+          labelProp: "label"
+        },
+        update: {
+          container: "ElCollapse",
+          item: "ElCollapseItem",
+          labelProp: "title"
+        }
+      },
+      loading: false,
+      newTime: "",
+      statusOptions,
+      xs_order_source_options,
+      xs_order_type_options,
+      ShowDataTableColumns,
+      cg_order_type_options,
+      centerDialogVisible: false,
+      activeOptions: [],
+      wsm_supplier: "",
+      wsm_supplierNo: "",
+      wsm_name: "",
+      wsm_code: "",
+      supplierNo: "",
+      supplier_name: "",
+      order_type: "",
+      activeNames: ["0", "1", "2", "3", "4", "5", "10"],
+      sitem: null,
+      select: "1",
+      input: "",
+      ruleForm: {
+        supplierName: [],
+        supplierNo: [],
+        remark: "",
+        oaCode: "",
+        cgdNo: "",
+        uid: ""
+      },
+      goodtype_options: [
+        {
+          value: "1",
+          label: "常规商品"
+        },
+        {
+          value: "2",
+          label: "赠品"
+        },
+        {
+          value: "3",
+          label: "样品"
+        }
+      ],
+      approvalStatusOptions: [
+        { value: "1", label: "待审核" },
+        { value: "2", label: "审核通过" },
+        { value: "3", label: "审核驳回" }
+      ],
+      rules: {
+        supplierNo: [
+          {
+            required: true,
+            trigger: "change",
+            validator: binded_valid_supplier
+          }
+        ],
+        oaCode: [
+          {
+            required: true,
+            trigger: "change",
+            validator: binded_valid_oa_code
+          }
+        ],
+        uid: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请选择申请人"
+          }
+        ],
+        cgdNo: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择销售单"
+          }
+        ],
+        remark: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请输入备注"
+          }
+        ]
+      }
+    };
+  },
+  mounted() {
+    this.getAllActive();
+    if (this.mode === "update") {
+      this.initData();
+    }
+  },
+  methods: {
+    async onUpdateStatus(payload) {
+      this.loading = true;
+      const res = await asyncRequest.changestatus({
+        id: this.id,
+        ...payload
+      });
+      this.loading = false;
+
+      if (res && res.code === 0 && res.data) {
+        this.initData();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      }
+    },
+    async initData() {
+      //请求详情...
+      const res = await asyncRequest.changeinfo({
+        id: this.id
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.detail = res.data;
+        const { id } = this.detail;
+        this.refresh(id);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      }
+    },
+
+    createLabelField(value) {
+      return {
+        [this.mapComponent[this.mode].labelProp]: value
+      };
+    },
+    async submit() {
+      try {
+        await this.$refs.ruleForm.validate();
+        const { supplierName, ...rest } = this.ruleForm;
+        const apply_name = this.activeOptions.find(
+          ({ id }) => id === rest.uid[0]
+        ).nickname;
+
+        const payload = {
+          type: "2",
+          apply_name,
+          code: rest.cgdNo,
+          oaCode: rest.oaCode,
+          remark: rest.remark,
+          apply_id: rest.uid[0],
+          change: {
+            customer_code: rest.supplierNo[0],
+            customerName: Array.isArray(supplierName)
+              ? supplierName[0]
+              : supplierName
+          }
+        };
+
+        console.log(111);
+
+        this.loading = true;
+        const res = await asyncRequest.create(payload);
+        this.loading = false;
+
+        if (res && res.code === 0 && res.data) {
+          this.$router.push("/dataCorrection/customerCorrection");
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    resetOrder() {
+      this.sitem = null;
+      this.ruleForm.cgdNo = "";
+      this.ruleForm.supplierName = "";
+      this.ruleForm.supplierNo = [];
+      this.$refs.ruleForm.validateField(["cgdNo"]);
+    },
+    async customerChange(e) {
+      const { code, label } = e;
+      console.log(e, "---");
+      this.ruleForm.supplierNo = code ? [code] : [];
+      this.ruleForm.supplierName = label || "";
+    },
+    refresh(id) {
+      this.centerDialogVisible = false;
+      id && this.getSaleOrderData(id);
+    },
+    async getSaleOrderData(id) {
+      this.loading = true;
+      const res = await asyncRequest.saleDetail({ id });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        this.ruleForm.cgdNo = this.sitem.orderCode;
+
+        if (this.mode !== "update") {
+          this.$refs.ruleForm && this.$refs.ruleForm.validateField("cgdNo");
+        }
+
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async getAllActive() {
+      const res = await asyncRequest.accountall({
+        ...this.dataForm,
+        size: 100000,
+        level: "2"
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.activeOptions = res.data.list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    }
+  }
+};
+</script>

src/views/dataCorrection/customerCorrection/components/waitApproval.vue

@@ -0,0 +1,57 @@
+<template>
+  <el-form ref="ruleForm" label-width="80px" size="mini" :model="ruleForm" :rules="rules">
+    <el-form-item label="状态" prop="status">
+      <el-select v-model="ruleForm.status" style="width:100%">
+        <el-option value="2" label="通过" />
+        <el-option value="3" label="驳回" />
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="备注" prop="remark">
+      <el-input placeholder="备注" v-model="ruleForm.remark" type="textarea" />
+    </el-form-item>
+
+    <el-form-item>
+      <div class="fr">
+        <el-button type="primary" @click="submit">保 存</el-button>
+      </div>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: "waitApproval",
+  computed: {
+    rules() {
+      return {
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
+        remark: [
+          {
+            required: this.ruleForm.status === "3",
+            message: "请输入备注",
+            trigger: "change"
+          }
+        ]
+      };
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+        status: "2",
+        remark: ""
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs.ruleForm.validate(isValid => {
+        if(!isValid) return
+        const { status, remark } = this.ruleForm;
+        this.$emit("confirm", { status, remark });
+      })
+    }
+  }
+};
+</script>

src/views/dataCorrection/customerCorrection/detail.vue

@@ -0,0 +1,30 @@
+<template>
+  <el-tabs style="padding:10px">
+    <el-tab-pane :label="title">
+      <correction-form />
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import CorrectionForm from "./components/correctionForm.vue";
+
+export default {
+  name: "",
+  components: {
+    CorrectionForm
+  },
+  computed: {
+    mode() {
+      return this.$route.query.mode || "create";
+    },
+    title() {
+      const mapTitle = {
+        update: "销售单客户修改申请详情",
+        create: "新建销售单客户修改申请"
+      };
+      return mapTitle[this.mode];
+    }
+  }
+};
+</script>

src/views/dataCorrection/customerCorrection/index.vue

@@ -0,0 +1,248 @@
+<template>
+  <div class="pagePadding">
+    <div class="box" v-if="powers.some((i) => i == '001')">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%;">
+            <el-row style="padding-left: 80px">
+              <el-col :span="5" style="width: 230px; float: left;">
+                <el-input
+                  v-model="parmValue.code"
+                  :size="'mini'"
+                  style="width: 100%"
+                  placeholder="销售单编号"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="5" style="width: 155px; float: left; margin-left: 10px">
+                <el-select
+                  size="mini"
+                  v-model="parmValue.status"
+                  placeholder="状态"
+                  clearable
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="opt in statusOptions"
+                    :key="opt.value"
+                    :label="opt.label"
+                    :value="opt.value"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="primary"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="searchList"
+                >刷新</el-button>
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >重置</el-button>
+              </el-col>
+
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 66px; padding: 0 0 0 10px"
+                v-if="powers.some((i) => i == '003')"
+              >
+                <el-button
+                  :size="searchSize"
+                  type="success"
+                  style="float: right"
+                  @click="routeGoto('customerCorrectionDetail', {
+                    mode:'create'
+                  })"
+                >添加</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+
+        <template #status="{scope}">
+          <el-tag
+            :size="'mini'"
+            :type="scope.row.status == '1' ? 'warning' : ''"
+            v-text="
+            (statusOptions.find((i)=> i.value == scope.row.status) || {})
+              .label || '--'
+          "
+          ></el-tag>
+        </template>
+
+        <template #before="{scope}">
+          <el-tooltip :content="'客户公司编码 : ' + scope.row.before.customer_code" placement="top">
+            <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+          </el-tooltip>
+          {{scope.row.before.customerName}}
+        </template>
+
+        <template #after="{scope}">
+          <el-tooltip :content="'客户公司编码 : ' + scope.row.after.customer_code" placement="top">
+            <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+          </el-tooltip>
+          {{scope.row.after.customerName}}
+        </template>
+        <!-- v-if="powers.some((i) => i == '007')" -->
+        <template #operation="{ scope }">
+          <el-tooltip effect="dark" content="详情" placement="top">
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('customerCorrectionDetail', {
+                id: scope.row.id,
+                mode: 'update'
+              })"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+    </div>
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/dataCorrection/order";
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import { columns } from "./columns";
+import { mapGetters } from "vuex";
+
+export default {
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const { btnList } = this.$store.getters;
+      const tran =
+        btnList.find(i => i.menu_route == "customerCorrection") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      statusOptions: [
+        { value: "1", label: "待审核" },
+        { value: "2", label: "审核通过" },
+        { value: "3", label: "审核驳回" }
+      ],
+      parmValue: {
+        code: "",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"]
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns: columns
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.cgdgetchangesupplierlist({
+        ...this.parmValue,
+        type: "2"
+      });
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        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;
+    },
+    //重置
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      };
+      this.parmValue = {
+        code: "",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      };
+      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();
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/dataCorrection/taxCorrection/columns.js

@@ -0,0 +1,56 @@
+const columns = [
+  {
+    prop: "code",
+    label: "咨询商品编号",
+    minWidth: "155"
+  },
+  {
+    prop:'oaCode',
+    label:'OA编号',
+    minWidth:'155'
+  },
+  {
+    prop:'status',
+    label:'状态',
+    _slot_:"status",
+    width:'90px'
+  },
+  {
+    label: "税率(修改前)",
+    minWidth: "185",
+    _slot_:"supplierBefore"
+  },
+  {
+    prop: "supplierNo",
+    label: "税率(修改后)",
+    minWidth: "185",
+    _slot_:'supplierAfter'
+  },
+  {
+    prop: "updatetime",
+    label: "修改时间",
+    minWidth: "145"
+  },
+
+  {
+    prop: "apply_name",
+    minWidth: "150px",
+    label: "申请人",
+  },
+  {
+    prop: "createtime",
+    minWidth: "150px",
+    label: "申请时间",
+  },
+  {
+    prop:'操作',
+    label:'操作',
+    width:'60px',
+    _slot_:'operation'
+  }
+]
+
+
+export {
+  columns,
+}

src/views/dataCorrection/taxCorrection/components/_columns.js

@@ -0,0 +1,184 @@
+const columns = [
+  {
+  type: "selection",
+    fixed: "left",
+    _noset_: true
+  },
+  {
+    prop: "spuCode",
+    label: "编号",
+    width: "160px",
+  },
+  {
+    prop: "good_name",
+    label: "名称",
+    "min-width": "160px",
+  },
+  {
+    prop: "cat_name",
+    label: "分类",
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+  },
+  {
+    prop: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    width: "70px",
+  },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "110px",
+  },
+  {
+    prop: "companyName",
+    label: "业务公司名称",
+    width: "110px",
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "140px",
+  }
+]
+const ShowDataTableColumns=[
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "lasttime",
+    label: "要求入库时间",
+    span: 6
+  },
+ 
+  {
+    prop: "supplier_name",
+    label: "销售方公司",
+    _slot_: "supplier_name",
+  },
+  {
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
+  },
+
+  {
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
+  },
+ 
+ 
+ 
+  {
+    prop: "total_fee",
+    label: "采购总成本",
+    span: 6
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
+  },
+  {
+    prop: "good_num",
+    label: "采购总数量",
+    span: 6
+  },
+  {
+    prop: "send_num",
+    label: "已发货数量",
+    span: 6
+  },
+  {
+    prop: "wsend_num",
+    label: "未发货数量",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+]
+const statusOptions = [
+  {
+    value: "0",
+    label: "新建待审核"
+  },
+  {
+    value: "1",
+    label: "审核通过"
+  },
+  {
+    value: "2",
+    label: "基础修改待审核"
+  },
+  {
+    value: "3",
+    label: "成本修改待审核"
+  }
+]
+
+const mianColumns=[
+  {
+    prop: "code",
+    label: "采购单编号",
+    span:  6
+  },
+  {
+    prop: "createtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "creater",
+    label: "创建人",
+    span: 4
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    span: 4
+  },
+  {
+    prop:'status',
+    label:'状态',
+    span: 4,
+    _slot_:'status'
+  },
+  {
+    label:"税率(修改前)",
+    span: 12,
+    _slot_:'before'
+  },
+  {
+    label: "税率(修改后)",
+    span: 12 ,
+    _slot_:'after'
+  },
+  {
+    prop:'remark',
+    label: "备注",
+    span: 24 ,
+  },
+]
+
+export { columns, statusOptions, ShowDataTableColumns,mianColumns }

src/views/dataCorrection/taxCorrection/components/addEdit.vue

@@ -0,0 +1,336 @@
+<template>
+  <el-dialog
+    title="咨询商品列表"
+    v-loading="loading"
+    :center="true"
+    align="left"
+    top="2vh"
+    width="1080px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin-top: -20px">
+      <ex-table
+        v-loading="loading"
+        @selection-change="list => selected = list"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+        @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+        @selection="selection_change"
+      >
+        <template #table-header="{}">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="6" style="width: 293px">
+                <period-date-picker
+                  :type="1"
+                  :width="'135px'"
+                  :size="searchSize"
+                  :start="parmValue.start"
+                  :end="parmValue.end"
+                  @timeReturned="handleTime"
+                />
+              </el-col>
+              <el-col :span="6" style="width: 250px; padding: 0 0 0 10px">
+                <el-input
+                  :size="searchSize"
+                  style="100%"
+                  v-model="parmValue.spuCode"
+                  :maxlength="40"
+                  clearable
+                  placeholder="商品编码"
+                  @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                ></el-input>
+              </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="6" style="width: 280px; padding: 10px 0px 0 0px">
+                <el-input
+                  :size="searchSize"
+                  style="100%"
+                  v-model="parmValue.good_name"
+                  :maxlength="40"
+                  clearable
+                  placeholder="商品名称"
+                  @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                ></el-input>
+              </el-col>
+
+              <el-col :span="4" style="width: 66px; float: right;margin-top:10px">
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="submit()"
+                  :size="searchSize"
+                  class="fr"
+                >提交</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+
+        <template #good_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.good_type == '0' ? 'warning' : ''"
+            v-text="
+            (options1.find((item) => item.id == scope.row.good_type) || {})
+              .name || '--'
+          "
+          ></el-tag>
+        </template>
+      </ex-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/dataCorrection/cgMessage";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import resToken from "@/mixins/resToken";
+
+import { columns, statusOptions } from "./_columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+export default {
+  mixins: [mixinPage, resToken],
+  props: ["showModel"],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"])
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val;
+      if (val) {
+        this.restSearch();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    }
+  },
+  data() {
+    return {
+      showModelThis: this.showModel,
+      select: "1",
+      input: "",
+      timeOBJ: {
+        start: "", //起始时间
+        end: "" // 结束时间
+      },
+      options: ["创建时间", "最晚入库时间"],
+      sselect: "创建时间",
+      // 状态
+      statusOptions: statusOptions,
+      cg_order_type_options,
+      options1: [
+        { id: "0", name: "否" },
+        { id: "1", name: "是" }
+      ],
+      selected: [],
+      loading: false,
+      showModel: false,
+      parmValue: {
+        order_type: "3",
+        bk_code: "", // 备库编码
+        orderCode: "", // 订单编号
+        wsm_in_code: "", // 入库单号
+        cgdNo: "", // 采购单编码
+        apply_name: "", // 申请人
+        good_name: "", // 产品名称
+        good_code: "", // 产品属性编号
+        status: "0", //状态
+        wsm_code: "", //入货仓库编码
+        start: "", //新建起始时间
+        end: "", // 新建结束时间
+        last_start: "", //最后入库时间开始
+        last_end: "", //最后入库时间结束
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        supplierNo: "",
+        wsm_supplierNo: ""
+      },
+      tableData: [],
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"]
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns: columns
+    };
+  },
+
+  methods: {
+    //提交
+    async submit() {
+      if (this.selected.length === 0) {
+        this.$message.warning("至少选择一条咨询商品！");
+        return;
+      }
+
+      if (this.selected.length != 1) {
+        this.$message.warning("只能选中一条数据！");
+        return;
+      }
+
+      const { spuCode, skuCode } = this.selected[0];
+      this.showModelThis = false;
+      // 刷新
+      this.$emit(
+        "refresh",
+        {
+          spuCode,
+          skuCode
+        } || ""
+      );
+    },
+
+    restSearch() {
+      this.sselect = "创建时间";
+      this.select = "1";
+      this.input = "";
+      this.timeOBJ = {
+        start: "", //起始时间
+        end: "" // 结束时间
+      };
+      this.parmValue = {
+        order_type: "3",
+        bk_code: "", // 备库编码
+        orderCode: "", // 订单编号
+        wsm_in_code: "", // 入库单号
+        cgdNo: "", // 采购单编码
+        apply_name: "", // 申请人
+        good_name: "", // 产品名称
+        good_code: "", // 产品属性编号
+        status: "0", //状态
+        wsm_code: "", //入货仓库编码
+        start: "", //新建起始时间
+        end: "", // 新建结束时间
+        last_start: "", //最后入库时间开始
+        last_end: "", //最后入库时间结束
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      };
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      };
+      this.searchList();
+    },
+    async handleClick(e) {
+      this.sselect = e;
+      this.parmValue.start = e === "创建时间" ? this.timeOBJ.start : "";
+      this.parmValue.end = e === "创建时间" ? this.timeOBJ.end : "";
+      this.parmValue.last_start = e !== "创建时间" ? this.timeOBJ.start : "";
+      this.parmValue.last_end = e !== "创建时间" ? this.timeOBJ.end : "";
+      if (
+        !(
+          (this.timeOBJ.start !== "" && this.timeOBJ.end === "") ||
+          (this.timeOBJ.start === "" && this.timeOBJ.end !== "")
+        )
+      ) {
+        this.parmValue.page = 1;
+        this.pageInfo.curr = 1;
+        await this.searchList();
+      }
+    },
+
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.loading = true;
+      const res = await asyncRequest.zxlist({
+        ...this.parmValue,
+        needRela: true
+      });
+      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 handleTime(e) {
+      if (e.startTime !== "") {
+        this.timeOBJ.start = e.startTime;
+      } else {
+        this.timeOBJ.start = "";
+      }
+      if (e.endTime !== "") {
+        this.timeOBJ.end = e.endTime;
+      } else {
+        this.timeOBJ.end = "";
+      }
+      await this.handleClick(this.sselect);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/dataCorrection/taxCorrection/components/correctionForm.vue

@@ -0,0 +1,429 @@
+<template>
+  <component
+    v-model="activeNames"
+    :is="mapComponent[mode].container"
+    label-width="80px"
+    size="mini"
+    :model="ruleForm"
+    :rules="rules"
+    ref="ruleForm"
+    v-loading="loading"
+  >
+    <el-row>
+      <el-collapse-item v-if="mode === 'update'" title="业务详情" name="0">
+        <show-data-table
+          style="margin: 0; padding: 0"
+          :sitem="detail"
+          v-if="detail"
+          :columns="mianColumns"
+        >
+          <template #before>{{detail.before.tax}}%</template>
+
+          <template #after>{{detail.after.tax}}%</template>
+
+          <template #status>
+            <el-tag
+              size="mini"
+            >{{(approvalStatusOptions.find(({value}) => value === detail.status) || {}).label || '--'}}</el-tag>
+          </template>
+        </show-data-table>
+      </el-collapse-item>
+
+      <el-row :span="24">
+        <component
+          name="1"
+          :is="mapComponent[mode].item"
+          v-bind="createLabelField('咨询商品')"
+          prop="cgdNo"
+        >
+          <el-select
+            style="width:100%"
+            placeholder="选择咨询商品"
+            filterable
+            remote
+            @focus="centerDialogVisible = true"
+            v-if="!sitem"
+          />
+          <el-collapse-transition>
+            <div style="display:flex" v-if="sitem">
+              <div style="`margin-top:10px;margin-right:${mode === 'create' ? '30px' : '0px'}`">
+                <show-goods-data-table
+                  :newTime="newTime"
+                  v-if="newTime !== ''"
+                  :type="'3'"
+                  :skucode="sitem.skuCode || sitem.code"
+                  :spucode="sitem.spuCode || sitem.code"
+                  :iscgd="false"
+                  @fetch="getZXProduct"
+                  border
+                />
+              </div>
+
+              <el-tooltip content="重新选择咨询商品" placement="top" v-if="mode !== 'update'">
+                <i
+                  class="el-icon-circle-close"
+                  size="mini"
+                  type="text"
+                  style="font-size:18px;cursor:pointer;margin-left:10px"
+                  @click="resetOrder"
+                />
+              </el-tooltip>
+            </div>
+          </el-collapse-transition>
+        </component>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="税率" prop="supplierNo">
+            <search-tax
+              :value="ruleForm.supplierNo"
+              :size="'mini'"
+              :isDetail="type !== 'add'"
+              :placeholder="'税率'"
+              @searchChange="taxsearchChange"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="OA编号" prop="oaCode">
+            <el-input :disabled="mode === 'update'" placeholder="OA编号" v-model="ruleForm.oaCode" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="mode !== 'update'">
+          <el-form-item label="申请人" prop="uid">
+            <el-select
+              v-model="ruleForm.uid"
+              :disabled="mode === 'update'"
+              multiple
+              remote
+              filterable
+              :multiple-limit="1"
+              clearable
+              placeholder="申请人"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in activeOptions"
+                :key="`touserid` + item.id"
+                :label="item.nickname"
+                :value="item.id"
+              >
+                <span style="float: left">{{ item.nickname }}</span>
+                <span
+                  style="
+                  float: right;
+                  color: #8492a6;
+                  font-size: 13px;
+                  padding: 0 25px 0 0;
+                "
+                >{{ item.role_name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              :disabled="mode === 'update'"
+              type="textarea"
+              placeholder="备注"
+              v-model="ruleForm.remark"
+              maxlength="2000"
+              show-word-limit
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-col :span="24" v-if="mode !== 'update'">
+        <el-button size="mini" class="fr" type="primary" @click="submit">保存</el-button>
+      </el-col>
+
+      <el-row v-else>
+        <el-collapse-item title="待审核" name="4" v-if="detail && Number(detail.status) === 1">
+          <div style="width:600px">
+            <wait-approval @confirm="onUpdateStatus" />
+          </div>
+        </el-collapse-item>
+      </el-row>
+    </el-row>
+
+    <add-edit
+      @refresh="refresh"
+      :showModel="centerDialogVisible"
+      @cancel="centerDialogVisible = false"
+    />
+  </component>
+</template>
+
+<script>
+import addEdit from "./addEdit.vue";
+import { statusOptions, ShowDataTableColumns, mianColumns } from "./_columns";
+import asyncRequest from "@/apis/service/dataCorrection/order";
+import { cg_order_type_options } from "@/assets/js/statusList";
+import WaitApproval from "./waitApproval.vue";
+import resToken from "../../../../mixins/resToken";
+import { isnumber } from "../../../../utils/validate";
+
+// const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
+const VALID_OA_CODE = function(_1, _2, callback) {
+  const { oaCode } = this.ruleForm;
+  if (!oaCode) {
+    callback(new Error("OA编号不能为空!"));
+  } else {
+    if (!isnumber(oaCode)) {
+      callback(new Error("OA编号必须为纯数字!"));
+    } else if (oaCode.length !== 12) {
+      callback(new Error("OA编号必须为12位!"));
+    } else {
+      callback();
+    }
+  }
+};
+
+const VALID_SUPPLIER = function(_1, _2, callback) {
+  const { supplierNo } = this.ruleForm;
+  console.log(supplierNo);
+  if (!supplierNo && Number(supplierNo) !== 0) {
+    callback(new Error("请输入税率"));
+  } else {
+    if (Number(supplierNo) === Number(this.sitem.tax)) {
+      callback(new Error("修改的税率不能与咨询商品原税率一致!"));
+    } else {
+      callback();
+    }
+  }
+};
+
+export default {
+  mixins: [resToken],
+  components: { addEdit, WaitApproval },
+  computed: {
+    mode() {
+      return this.$route.query.mode || "create";
+    },
+    id() {
+      return this.$route.query.id || "";
+    }
+  },
+  data() {
+    const binded_valid_oa_code = VALID_OA_CODE.bind(this);
+    const binded_valid_supplier = VALID_SUPPLIER.bind(this);
+
+    return {
+      activeNames: ["1", "2", "3", "4"],
+      mianColumns,
+      detail: {},
+      mapComponent: {
+        create: {
+          container: "ElForm",
+          item: "ElFormItem",
+          labelProp: "label"
+        },
+        update: {
+          container: "ElCollapse",
+          item: "ElCollapseItem",
+          labelProp: "title"
+        }
+      },
+      loading: false,
+      newTime: "",
+      statusOptions,
+      ShowDataTableColumns,
+      cg_order_type_options,
+      centerDialogVisible: false,
+      activeOptions: [],
+      wsm_supplier: "",
+      wsm_supplierNo: "",
+      wsm_name: "",
+      wsm_code: "",
+      supplierNo: "",
+      supplier_name: "",
+      order_type: "",
+      activeNames: ["0", "1", "2", "3", "4", "5", "10"],
+      sitem: null,
+      select: "1",
+      input: "",
+      ruleForm: {
+        supplierName: "",
+        supplierNo: "",
+        remark: "",
+        oaCode: "",
+        cgdNo: "",
+        uid: ""
+      },
+      approvalStatusOptions: [
+        { value: "1", label: "待审核" },
+        { value: "2", label: "审核通过" },
+        { value: "3", label: "审核驳回" }
+      ],
+      rules: {
+        supplierNo: [
+          {
+            required: true,
+            trigger: "change",
+            validator: binded_valid_supplier
+          }
+        ],
+        oaCode: [
+          {
+            required: true,
+            trigger: "change",
+            validator: binded_valid_oa_code
+          }
+        ],
+        uid: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请选择申请人"
+          }
+        ],
+        cgdNo: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择采购单"
+          }
+        ],
+        remark: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请输入备注"
+          }
+        ]
+      }
+    };
+  },
+  mounted() {
+    this.getAllActive();
+    if (this.mode === "update") {
+      this.initData();
+    }
+  },
+  methods: {
+    taxsearchChange(e) {
+      const num = e.split("%");
+      this.ruleForm.supplierNo = Number(num[0]);
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("supplierNo");
+    },
+    // number_change(tax) {
+    //   this.ruleForm.supplierNo = tax;
+    //   this.$refs.ruleForm.validateField("supplierNo");
+    // },
+    async onUpdateStatus(payload) {
+      this.loading = true;
+      const res = await asyncRequest.changestatus({
+        id: this.id,
+        ...payload
+      });
+      this.loading = false;
+
+      if (res && res.code === 0 && res.data) {
+        this.initData();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      }
+    },
+    async initData() {
+      //请求详情...
+      const res = await asyncRequest.changeinfo({
+        id: this.id
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.detail = res.data;
+        const { code } = this.detail;
+        this.refresh({
+          spuCode: code,
+          skuCode: code
+        });
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      }
+    },
+
+    createLabelField(value) {
+      return {
+        [this.mapComponent[this.mode].labelProp]: value
+      };
+    },
+    async submit() {
+      try {
+        await this.$refs.ruleForm.validate();
+        const { supplierName, ...rest } = this.ruleForm;
+
+        const apply_name = this.activeOptions.find(
+          ({ id }) => id === rest.uid[0]
+        ).nickname;
+
+        const payload = {
+          type: "3",
+          apply_name,
+          code: rest.cgdNo,
+          oaCode: rest.oaCode,
+          remark: rest.remark,
+          apply_id: rest.uid[0],
+          change: {
+            tax: rest.supplierNo
+          }
+        };
+
+        this.loading = true;
+        const res = await asyncRequest.create(payload);
+        this.loading = false;
+
+        if (res && res.code === 0 && res.data) {
+          this.$router.push("/dataCorrection/taxCorrection");
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        }
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    resetOrder() {
+      this.sitem = null;
+      // this.$refs.ruleForm.validateField(["cgdNo"]);
+    },
+    refresh(product) {
+      this.centerDialogVisible = false;
+
+      this.sitem = { ...product };
+      this.newTime = this.getNewTime();
+      // spuCode && this.getZXProduct();
+    },
+    async getZXProduct(result) {
+      const { data } = result;
+      const { spuCode, tax } = data;
+      this.sitem = data;
+      // this.ruleForm.supplierNo = Number(tax);
+      this.ruleForm.cgdNo = spuCode;
+      this.refs.ruleForm.validateField(["cgdNo"]);
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async getAllActive() {
+      const res = await asyncRequest.accountall({
+        ...this.dataForm,
+        size: 100000,
+        level: "2"
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.activeOptions = res.data.list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    }
+  }
+};
+</script>

src/views/dataCorrection/taxCorrection/components/waitApproval.vue

@@ -0,0 +1,57 @@
+<template>
+  <el-form ref="ruleForm" label-width="80px" size="mini" :model="ruleForm" :rules="rules">
+    <el-form-item label="状态" prop="status">
+      <el-select v-model="ruleForm.status" style="width:100%">
+        <el-option value="2" label="通过" />
+        <el-option value="3" label="驳回" />
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="备注" prop="remark">
+      <el-input placeholder="备注" v-model="ruleForm.remark" type="textarea" />
+    </el-form-item>
+
+    <el-form-item>
+      <div class="fr">
+        <el-button type="primary" @click="submit">保 存</el-button>
+      </div>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: "waitApproval",
+  computed: {
+    rules() {
+      return {
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
+        remark: [
+          {
+            required: this.ruleForm.status === "3",
+            message: "请输入备注",
+            trigger: "change"
+          }
+        ]
+      };
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+        status: "2",
+        remark: ""
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs.ruleForm.validate(isValid => {
+        if(!isValid) return
+        const { status, remark } = this.ruleForm;
+        this.$emit("confirm", { status, remark });
+      })
+    }
+  }
+};
+</script>

src/views/dataCorrection/taxCorrection/detail.vue

@@ -0,0 +1,30 @@
+<template>
+  <el-tabs style="padding:10px">
+    <el-tab-pane :label="title">
+      <correction-form />
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import CorrectionForm from "./components/correctionForm.vue";
+
+export default {
+  name: "",
+  components: {
+    CorrectionForm
+  },
+  computed: {
+    mode() {
+      return this.$route.query.mode || "create";
+    },
+    title() {
+      const mapTitle = {
+        update: "咨询商品税率修改申请详情",
+        create: "新建咨询商品税率修改申请"
+      };
+      return mapTitle[this.mode];
+    }
+  }
+};
+</script>

src/views/dataCorrection/taxCorrection/index.vue

@@ -0,0 +1,245 @@
+<template>
+  <div class="pagePadding">
+    <div class="box" v-if="powers.some((i) => i == '001')">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%;">
+            <el-row style="padding-left: 80px">
+              <!-- <el-col :span="7" style="width: 293px">
+                <period-date-picker
+                  :type="1"
+                  :width="'135px'"
+                  :size="searchSize"
+                  :start="parmValue.start"
+                  :end="parmValue.end"
+                  @timeReturned="handleTime"
+                />
+              </el-col>-->
+              <el-col :span="5" style="width: 230px; float: left;">
+                <el-input
+                  v-model="parmValue.code"
+                  :size="'mini'"
+                  style="width: 100%"
+                  placeholder="咨询商品编号"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="5" style="width: 155px; float: left; margin-left: 10px">
+                <el-select
+                  size="mini"
+                  v-model="parmValue.status"
+                  placeholder="状态"
+                  clearable
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="opt in statusOptions"
+                    :key="opt.value"
+                    :label="opt.label"
+                    :value="opt.value"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="primary"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="searchList"
+                >刷新</el-button>
+              </el-col>
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >重置</el-button>
+              </el-col>
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 66px; padding: 0 0 0 10px"
+                v-if="powers.some((i) => i == '003')"
+              >
+                <el-button
+                  :size="searchSize"
+                  type="success"
+                  style="float: right"
+                  @click="routeGoto('taxCorrectionDetail', {
+                    mode:'create'
+                  })"
+                >添加</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+
+        <template #status="{scope}">
+          <el-tag
+            :size="'mini'"
+            :type="scope.row.status == '1' ? 'warning' : ''"
+            v-text="
+            (statusOptions.find((i)=> i.value == scope.row.status) || {})
+              .label || '--'
+          "
+          ></el-tag>
+        </template>
+
+        <template #supplierBefore="{scope}">{{scope.row.before.tax}}%</template>
+        <template #supplierAfter="{scope}">{{scope.row.after.tax}}%</template>
+        <template #operation="{ scope }">
+          <el-tooltip effect="dark" content="详情" placement="top">
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('taxCorrectionDetail', {
+                id: scope.row.id,
+                mode: 'update'
+              })"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+    </div>
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/dataCorrection/order";
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import { columns } from "./columns";
+import { mapGetters } from "vuex";
+
+export default {
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const { btnList } = this.$store.getters;
+      const tran = btnList.find(i => i.menu_route == "taxCorrection") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      statusOptions: [
+        { value: "1", label: "待审核" },
+        { value: "2", label: "审核通过" },
+        { value: "3", label: "审核驳回" }
+      ],
+      parmValue: {
+        code: "",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"]
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns: columns
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    async searchList() {
+      this.loading = true;
+
+      const res = await asyncRequest.cgdgetchangesupplierlist({
+        ...this.parmValue,
+        type: "3"
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        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;
+    },
+    //重置
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      };
+      this.parmValue = {
+        code: "",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      };
+      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();
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/dataCorrection/vendorCorrection/columns.js

@@ -42,8 +42,17 @@ const columns = [
     prop: "createtime",
     minWidth: "150px",
     label: "申请时间",
+  },
+  {
+    prop:'操作',
+    label:'操作',
+    width:'60px',
+    _slot_:'operation'
   }
 ]
+
+
+
 export {
-  columns
+  columns,
 }

src/views/dataCorrection/vendorCorrection/components/_columns.js

@@ -254,4 +254,48 @@ const statusOptions = [
   { value: "4", label: "已取消订单" },
 ];
 
-export { columns, statusOptions, ShowDataTableColumns }
+const mianColumns=[
+  {
+    prop: "code",
+    label: "采购单编号",
+    span:  6
+  },
+  {
+    prop: "createtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "creater",
+    label: "创建人",
+    span: 4
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    span: 4
+  },
+  {
+    prop:'status',
+    label:'状态',
+    span: 4,
+    _slot_:'status'
+  },
+  {
+    label:"供应商(修改前)",
+    span: 12,
+    _slot_:'before'
+  },
+  {
+    label: "供应商(修改后)",
+    span: 12 ,
+    _slot_:'after'
+  },
+  {
+    prop:'remark',
+    label: "备注",
+    span: 24 ,
+  },
+]
+
+export { columns, statusOptions, ShowDataTableColumns,mianColumns }

src/views/dataCorrection/vendorCorrection/components/addEdit.vue

@@ -43,7 +43,6 @@
                   v-model="parmValue.status"
                   filterable
                   clearable
-                  disabled
                   placeholder="采购单状态"
                   style="width: 100%"
                   @change="
@@ -85,7 +84,7 @@
                 </el-select>
               </el-col>
 
-              <el-col :span="4" style="width: 130px; padding: 0 10px">
+              <!-- <el-col :span="4" style="width: 130px; padding: 0 10px">
                 <el-dropdown @command="handleClick($event)" :size="searchSize">
                   <el-button :size="searchSize" style="width: 120px">
                     {{ sselect }}
@@ -95,7 +94,7 @@
                     <el-dropdown-item v-for="item in options" :key="item" :command="item">{{ item }}</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-              </el-col>
+              </el-col>-->
 
               <el-col :span="4" style="width: 300px; padding: 0 0 10px 10px">
                 <period-date-picker
@@ -118,7 +117,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="6" style="width: 500px; padding: 0 0 0 0px">
+              <el-col :span="4" style="width: 380px; padding: 0 0 0 0px">
                 <el-input
                   clearable
                   placeholder="关键字"
@@ -147,11 +146,24 @@
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
                     <el-option label="供应商负责人" value="6"></el-option>
-                    <el-option label="采购供应商编号" value="7"></el-option>
+                    <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
                     <el-option label="订单编号" value="8"></el-option>
                   </el-select>
                 </el-input>
               </el-col>
+              <el-col :span="4" style="width: 300px;margin-left:10px">
+                <search-supplier
+                  :size="'mini'"
+                  :value="parmValue.supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="parmValue.supplierName"
+                  :isDetail="true"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
               </el-col>
@@ -254,7 +266,7 @@ export default {
         apply_name: "", // 申请人
         good_name: "", // 产品名称
         good_code: "", // 产品属性编号
-        status: "0", //状态
+        status: "", //状态
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
         end: "", // 新建结束时间
@@ -262,8 +274,9 @@ export default {
         last_end: "", //最后入库时间结束
         page: 1, // 页码
         size: 15, // 每页显示条数
-        supplierNo: "",
-        wsm_supplierNo: ""
+        supplierNo: [],
+        wsm_supplierNo: "",
+        supplierName: []
       },
       tableData: [],
       // 表格 - 数据
@@ -313,6 +326,8 @@ export default {
         end: "" // 结束时间
       };
       this.parmValue = {
+        supplierNo: [],
+        supplierName: [],
         order_type: "3",
         bk_code: "", // 备库编码
         orderCode: "", // 订单编号
@@ -321,7 +336,7 @@ export default {
         apply_name: "", // 申请人
         good_name: "", // 产品名称
         good_code: "", // 产品属性编号
-        status: "0", //状态
+        status: "", //状态
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
         end: "", // 新建结束时间
@@ -338,6 +353,12 @@ export default {
       };
       this.searchList();
     },
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.parmValue.supplierNo = code ? [code] : [];
+      this.parmValue.supplierName = label ? [label] : [];
+      this.searchList();
+    },
     async handleClick(e) {
       this.sselect = e;
       this.parmValue.start = e === "创建时间" ? this.timeOBJ.start : "";
@@ -372,10 +393,20 @@ export default {
       this.parmValue.good_code = this.select === "4" ? this.input : ""; // 产品属性编号
       this.parmValue.good_name = this.select === "5" ? this.input : ""; // 产品名称
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
-      this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 订单编号
+
+      // this.parmValue.supplierNo = Array.isArray(this.parmValue.supplierNo)
+      //   ? this.parmValue.supplierNo[0]
+      //   : "";
+
       // this.wsm_supplierNo = [];
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.list({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo)
+          ? this.parmValue.supplierNo[0]
+          : this.parmValue.supplierNo
+      });
+
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);

src/views/dataCorrection/vendorCorrection/components/correctionForm.vue

@@ -7,9 +7,37 @@
     :model="ruleForm"
     :rules="rules"
     ref="ruleForm"
+    v-loading="loading"
   >
     <el-row>
-      <el-collapse-item v-if="mode === 'update'" title="业务详情" name="0">TODO......</el-collapse-item>
+      <el-collapse-item v-if="mode === 'update'" title="业务详情" name="0">
+        <show-data-table
+          v-if="detail"
+          style="margin: 0; padding: 0"
+          :sitem="detail"
+          :columns="mianColumns"
+        >
+          <template #before>
+            <el-tooltip :content="'供应商公司编码 : ' + detail.before.supplierNo" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            {{detail.before.supplier_name}}
+          </template>
+
+          <template #after>
+            <el-tooltip :content="'供应商公司编码 : ' + detail.after.supplierNo" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            {{detail.after.supplier_name}}
+          </template>
+
+          <template #status>
+            <el-tag
+              size="mini"
+            >{{(approvalStatusOptions.find(({value}) => value === detail.status) || {}).label || '--'}}</el-tag>
+          </template>
+        </show-data-table>
+      </el-collapse-item>
 
       <el-row :span="24">
         <component
@@ -95,13 +123,9 @@
                   </template>
 
                   <template slot="wsm">
-                    <span>{{ sitem.wsm_supplier }}/{{ sitem.wsm_name }}</span>
+                    <span>{{ sitem.wsm_name }}</span>
                     <el-popover placement="top" width="300" trigger="hover">
                       <ul>
-                        <li>
-                          <span>仓库公司编号：</span>
-                          <span>{{ sitem.wsm_supplierNo }}</span>
-                        </li>
                         <li>
                           <span>仓库名称编号：</span>
                           <span>{{ sitem.wsm_code }}</span>
@@ -226,7 +250,7 @@
       </el-col>
 
       <el-row v-else>
-        <el-collapse-item title="待审核" name="4">
+        <el-collapse-item title="待审核" name="4" v-if="detail && Number(detail.status) === 1">
           <div style="width:600px">
             <wait-approval @confirm="onUpdateStatus" />
           </div>
@@ -244,22 +268,22 @@
 
 <script>
 import addEdit from "./addEdit.vue";
-import { statusOptions, ShowDataTableColumns } from "./_columns";
+import { statusOptions, ShowDataTableColumns, mianColumns } from "./_columns";
 import asyncRequest from "@/apis/service/dataCorrection/order";
 import { cg_order_type_options } from "@/assets/js/statusList";
 import WaitApproval from "./waitApproval.vue";
-
-const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
+import resToken from "../../../../mixins/resToken";
+import { isnumber } from "../../../../utils/validate";
 
 const VALID_OA_CODE = function(_1, _2, callback) {
   const { oaCode } = this.ruleForm;
   if (!oaCode) {
     callback(new Error("OA编号不能为空!"));
   } else {
-    if (reg.test(oaCode)) {
-      callback();
-    } else {
-      callback(new Error("OA编号必须包含数字和字母!"));
+    if (!isnumber(oaCode)) {
+      callback(new Error("OA编号必须为纯数字!"));
+    } else if (oaCode.length !== 12) {
+      callback(new Error("OA编号必须为12位!"));
     }
   }
 };
@@ -282,6 +306,7 @@ const VALID_SUPPLIER = function(_1, _2, callback) {
 };
 
 export default {
+  mixins: [resToken],
   components: { addEdit, WaitApproval },
   computed: {
     mode() {
@@ -297,6 +322,8 @@ export default {
 
     return {
       activeNames: ["1", "2", "3", "4"],
+      mianColumns,
+      detail: {},
       mapComponent: {
         create: {
           container: "ElForm",
@@ -309,6 +336,7 @@ export default {
           labelProp: "title"
         }
       },
+      loading: false,
       newTime: "",
       statusOptions,
       ShowDataTableColumns,
@@ -334,6 +362,11 @@ export default {
         cgdNo: "",
         uid: ""
       },
+      approvalStatusOptions: [
+        { value: "1", label: "待审核" },
+        { value: "2", label: "审核通过" },
+        { value: "3", label: "审核驳回" }
+      ],
       rules: {
         supplierNo: [
           {
@@ -380,11 +413,35 @@ export default {
     }
   },
   methods: {
-    onUpdateStatus() {},
-    initData() {
+    async onUpdateStatus(payload) {
+      this.loading = true;
+      const res = await asyncRequest.changestatus({
+        id: this.id,
+        ...payload
+      });
+      this.loading = false;
+
+      if (res && res.code === 0 && res.data) {
+        this.initData();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      }
+    },
+    async initData() {
       //请求详情...
-      this.refresh(this.id);
+      const res = await asyncRequest.changeinfo({
+        id: this.id
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.detail = res.data;
+        const { code } = this.detail;
+        this.refresh(code);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      }
     },
+
     createLabelField(value) {
       return {
         [this.mapComponent[this.mode].labelProp]: value
@@ -395,18 +452,34 @@ export default {
         await this.$refs.ruleForm.validate();
         const { supplierName, ...rest } = this.ruleForm;
 
+        const apply_name = this.activeOptions.find(
+          ({ id }) => id === rest.uid[0]
+        ).nickname;
+
         const payload = {
           type: "1",
+          apply_name,
           code: rest.cgdNo,
           oaCode: rest.oaCode,
           remark: rest.remark,
+          apply_id: rest.uid[0],
           change: {
             supplierNo: rest.supplierNo[0],
-            supplierName
+            supplier_name: supplierName
           }
         };
 
-        // const {} = await asyncRequest.
+        this.loading = true;
+        const res = await asyncRequest.create(payload);
+        this.loading = false;
+
+        if (res && res.code === 0 && res.data) {
+          this.$router.push("/dataCorrection/vendorCorrection");
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
       } catch (e) {
         console.log(e);
       }
@@ -419,8 +492,9 @@ export default {
       this.$refs.ruleForm.validateField(["cgdNo"]);
     },
     async supplierChange(e) {
-      const { code } = e;
+      const { code, label } = e;
       this.ruleForm.supplierNo = code ? [code] : [];
+      this.ruleForm.supplierName = label;
     },
     refresh(cgdNo) {
       this.centerDialogVisible = false;
@@ -461,8 +535,8 @@ export default {
           } = this.sitem;
           this.order_type = order_type || "";
           this.supplierNo = supplierNo || "";
-          this.ruleForm.supplierName = supplier_name || "";
-          this.ruleForm.supplierNo = supplierNo ? [supplierNo] : [];
+          // this.ruleForm.supplierName = supplier_name || "";
+          // this.ruleForm.supplierNo = supplierNo ? [supplierNo] : [];
           if (this.order_type === "1") {
             this.wsm_supplier = wsm_supplier || "";
             this.wsm_supplierNo = wsm_supplierNo || "";

src/views/dataCorrection/vendorCorrection/index.vue

@@ -77,6 +77,15 @@
                   @click="searchList"
                 >刷新</el-button>
               </el-col>
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >重置</el-button>
+              </el-col>
+
               <el-col
                 :span="3"
                 class="fr"
@@ -88,19 +97,10 @@
                   type="success"
                   style="float: right"
                   @click="routeGoto('vendorCorrectionDetail', {
-                    id:'CG2306130936138383'
+                    mode:'create'
                   })"
                 >添加</el-button>
               </el-col>
-
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  :size="searchSize"
-                  style="float: right"
-                  @click="restSearch"
-                >重置</el-button>
-              </el-col>
             </el-row>
           </div>
         </template>
@@ -129,6 +129,18 @@
           </el-tooltip>
           {{scope.row.after.supplier_name}}
         </template>
+        <!-- v-if="powers.some((i) => i == '007')" -->
+        <template #operation="{ scope }">
+          <el-tooltip effect="dark" content="详情" placement="top">
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('vendorCorrectionDetail', {
+                id: scope.row.id,
+                mode: 'update'
+              })"
+            ></i>
+          </el-tooltip>
+        </template>
       </ex-table>
     </div>
 

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -24,18 +24,8 @@
             max-height="380px"
             style="width: 100%"
           >
-            <el-table-column
-              prop="spuCode"
-              label="编号"
-              width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="good_img"
-              label="图片"
-              width="45"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="spuCode" label="编号" width="160" show-overflow-tooltip />
+            <el-table-column prop="good_img" label="图片" width="45" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div
                   v-if="scope.row.good_img"
@@ -46,34 +36,15 @@
                   <img
                     :src="scope.row.good_img"
                     style="display: inline-block; width: 100%; height: 100%"
-                    alt=""
+                    alt
                   />
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="good_name"
-              label="名称"
-              min-width="160px"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="cat_name"
-              label="分类"
-              min-width="100"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="brand_name"
-              label="品牌"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="good_type"
-              label="定制"
-              width="50"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="good_name" label="名称" min-width="160px" show-overflow-tooltip />
+            <el-table-column prop="cat_name" label="分类" min-width="100" show-overflow-tooltip />
+            <el-table-column prop="brand_name" label="品牌" show-overflow-tooltip />
+            <el-table-column prop="good_type" label="定制" width="50" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-tag
                   :size="'mini'"
@@ -85,30 +56,10 @@
                 ></el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="supplierNo"
-              label="供应商编号"
-              width="110"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="supplier_name"
-              label="供应商名称"
-              width="110"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="companyNo"
-              label="业务公司编号"
-              width="110"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="company"
-              label="业务公司名称"
-              width="110"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="supplierNo" label="供应商编号" width="110" show-overflow-tooltip />
+            <el-table-column prop="supplier_name" label="供应商名称" width="110" show-overflow-tooltip />
+            <el-table-column prop="companyNo" label="业务公司编号" width="110" show-overflow-tooltip />
+            <el-table-column prop="company" label="业务公司名称" width="110" show-overflow-tooltip />
           </el-table>
         </el-col>
         <el-col :span="24">
@@ -153,16 +104,12 @@
                     v-model="ruleForm.online_remark"
                   />
                 </el-form-item>
-                <el-button
-                  v-if="id !== '007'"
-                  type="primary"
-                  :size="'mini'"
-                  @click="submitForm"
-                  >保 存
-                </el-button>
-                <el-button :size="'mini'" @click="showModelThis = false">{{
+                <el-button v-if="id !== '007'" type="primary" :size="'mini'" @click="submitForm">保 存</el-button>
+                <el-button :size="'mini'" @click="showModelThis = false">
+                  {{
                   id == "007" ? "关 闭" : "取 消"
-                }}</el-button>
+                  }}
+                </el-button>
               </el-col>
             </el-row>
           </el-form>
@@ -185,12 +132,12 @@ export default {
       ruleForm: {
         platform: "", //string	平台id
         online_reason: "", //string	上线原因
-        online_remark: "", //string	上线备注
+        online_remark: "" //string	上线备注
       },
       //是否定制
       options1: [
         { id: "0", name: "否" },
-        { id: "1", name: "是" },
+        { id: "1", name: "是" }
       ],
       rulesThis: this.rules,
       rules: {
@@ -198,28 +145,28 @@ export default {
           {
             required: true,
             message: "请选择所属平台",
-            trigger: "change",
-          },
+            trigger: "change"
+          }
         ],
         online_reason: [
           {
             required: true,
             message: "上线原因不能为空",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         online_remark: [
           {
             required: true,
             message: "上线备注不能为空",
-            trigger: "blur",
-          },
-        ],
-      },
+            trigger: "blur"
+          }
+        ]
+      }
     };
   },
   watch: {
-    showModel: function (val) {
+    showModel: function(val) {
       this.showModelThis = val;
       if (val) {
         this.initForm();
@@ -229,7 +176,7 @@ export default {
       if (!val) {
         this.$emit("cancel");
       }
-    },
+    }
   },
   methods: {
     async initForm() {
@@ -247,7 +194,7 @@ export default {
           this.ruleForm = {
             platform: "", //string	平台id
             online_reason: "", //string	上线原因
-            online_remark: "", //string	上线备注
+            online_remark: "" //string	上线备注
           };
         }
       });
@@ -258,7 +205,7 @@ export default {
       this.$refs.ruleForm.validateField("platform");
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (!this.loading) {
             this.loading = true;
@@ -266,7 +213,7 @@ export default {
             // model.platform = model.platform.toString();
             model.codes = [];
             let list = JSON.parse(JSON.stringify(this.sitem));
-            list.forEach((e) => {
+            list.forEach(e => {
               model.codes.push(e.spuCode);
             });
             let { code, data, message } = await asyncRequest.online_add(model);
@@ -274,7 +221,7 @@ export default {
             if (code === 0) {
               this.$notify.success({
                 title: "已成功添加至上线流程！",
-                message: "",
+                message: ""
               });
               this.showModelThis = false;
               // 刷新
@@ -285,7 +232,7 @@ export default {
               let resList = JSON.parse(JSON.stringify(data));
 
               let htmlList = "<ul>";
-              resList.forEach((v) => {
+              resList.forEach(v => {
                 htmlList += `<li>
           <img src='${v.good_img}' style='width: 20px; height: 20px'
                   class='hover'
@@ -304,7 +251,7 @@ export default {
               this.$notify({
                 title: "以下商品已上线或已经在审批流程中！",
                 dangerouslyUseHTMLString: true,
-                message: htmlList,
+                message: htmlList
               });
             } else {
               this.$message.warning(message);
@@ -315,8 +262,8 @@ export default {
           return false;
         }
       });
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/goodStore/dealGoodsPool/columns.js

@@ -46,12 +46,6 @@ const listCol = [
     label: "编号",
     width: "160px",
   },
-  // {
-  //   prop: "good_img",
-  //   label: "图片",
-  //   _slot_: "good_img",
-  //   width: "45px",
-  // },
   {
     prop: "good_name",
     label: "名称",
@@ -71,22 +65,6 @@ const listCol = [
     _slot_: "good_type",
     width: "70px",
   },
-  // {
-  //   prop: "status",
-  //   label: "状态",
-  //   _slot_: "status",
-  //   width: "118px",
-  // },
-  // {
-  //   prop: "supplierNo",
-  //   label: "供应商编号",
-  //   width: "110px",
-  // },
-  // {
-  //   prop: "supplier_name",
-  //   label: "供应商名称",
-  //   width: "110px",
-  // },
   {
     prop: "companyNo",
     label: "业务公司编号",
@@ -433,4 +411,4 @@ const rules = {
   },
 }
 
-export { options1, options2, options3, options4, options5, options6, options7, listCol, rules }
+export { options1, options2, options3, options4, options5, options6, options7, listCol, rules }

src/views/goodStore/dealGoodsPool/index.vue

@@ -70,35 +70,17 @@
               class="fr"
               style="width: 110px; padding: 0 0 0 10px"
               v-if="powers.some((i) => i == '055') && !isSupertube"
-             
             >
-              <el-button
-                :size="searchSize"
-                type="warning"
-                style="float: right"
-                @click="add_online"
-              >
+              <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-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 :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 :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> -->
@@ -126,11 +108,11 @@
                   <el-option label="供应商名称" value="4" />
                 </el-select>
               </el-input>
-            </el-col> -->
+          </el-col>-->
 
           <!-- </el-row> -->
-        </div></template
-      >
+        </div>
+      </template>
 
       <!-- <template #good_img="{ scope }">
         <div
@@ -145,7 +127,7 @@
             alt=""
           />
         </div>
-      </template> -->
+      </template>-->
       <!-- <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
@@ -155,7 +137,7 @@
               .name || '--'
           "
         ></el-tag>
-      </template> -->
+      </template>-->
       <template #good_type="{ scope }">
         <el-tag
           :size="tablebtnSize"
@@ -175,7 +157,6 @@
           placement="top"
         >
           <i class="el-icon-view tb-icon" @click="show_view(scope.row)"></i>
-           
         </el-tooltip>
       </template>
     </ex-table>
@@ -190,7 +171,7 @@
       @cancel="visible = false"
     />
 
-     <add-edit
+    <add-edit
       :id="''"
       :sitem="changeList"
       :show-model="showModel"
@@ -203,7 +184,7 @@
 <script>
 import asyncRequest from "@/apis/service/goodStore/dealGoodsPool";
 import mixinPage from "@/mixins/elPaginationHandle";
-import companyHelper from "@/mixins/companyHelper"
+import companyHelper from "@/mixins/companyHelper";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 import { listCol, options1 } from "./columns";
@@ -222,11 +203,11 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "dealGoodsPool"
+          item => item.menu_route == "dealGoodsPool"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];
-    },
+    }
   },
   data() {
     return {
@@ -235,26 +216,26 @@ export default {
       select: "1",
       sinput: "",
       //弹窗
-      showModel:false,
+      showModel: false,
       //选中数组
-      changeList:[],
+      changeList: [],
       statusList: [
         {
           code: "0",
-          name: "新建待审核",
+          name: "新建待审核"
         },
         {
           code: "1",
-          name: "审核通过",
+          name: "审核通过"
         },
         {
           code: "2",
-          name: "基础修改待审核",
+          name: "基础修改待审核"
         },
         {
           code: "3",
-          name: "成本修改待审核",
-        },
+          name: "成本修改待审核"
+        }
       ],
 
       options1: options1,
@@ -266,8 +247,8 @@ export default {
         end: "",
         status: "",
         creater: "",
-        spuCode:"",
-        good_name:""
+        spuCode: "",
+        good_name: ""
       },
 
       // 表格 - 数据
@@ -276,19 +257,19 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ["setcol"]
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格 - 列参数
       columns: listCol,
       supplierNo: [],
       cat_id: [],
-      brandid: [],
+      brandid: []
     };
   },
   mounted() {
@@ -299,12 +280,12 @@ export default {
   },
   methods: {
     //点击商品上线
-    add_online(){
-       if (this.changeList.length === 0) {
+    add_online() {
+      if (this.changeList.length === 0) {
         this.$message.warning("至少选择一个商品！");
         return;
       }
-       if (this.changeList.length >100) {
+      if (this.changeList.length > 100) {
         this.$message.warning("商品数量不能超过100！");
         return;
       }
@@ -330,7 +311,7 @@ export default {
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       };
       this.parmValue = {
         page: 1, // 页码
@@ -339,8 +320,8 @@ export default {
         end: "",
         status: "",
         creater: "",
-        spuCode:"",
-        good_name:""
+        spuCode: "",
+        good_name: ""
       };
       this.searchList();
     },
@@ -396,23 +377,26 @@ export default {
      * @param {String} status 0-禁用 1-启用
      */
     async changeStatus(id, status) {
-      await this.$confirm(`确定要改为${status + '' === "1" ? "禁用" : "启用"}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
+      await this.$confirm(
+        `确定要改为${status + "" === "1" ? "禁用" : "启用"}？`,
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
         .then(async () => {
           this.loading = true;
           const model = {
             id: id,
-            status: status + '' === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1"
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.loading = false;
             this.$notify.success({
               title: "状态修改成功！",
-              message: "",
+              message: ""
             });
             await this.searchList();
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -430,17 +414,17 @@ export default {
       await this.$confirm("确定要删除？", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           const model = {
-            codes: [code],
+            codes: [code]
           };
           const res = await asyncRequest.delete(model);
           if (res && res.code === 0) {
             this.$notify.success({
               title: "删除成功",
-              message: "",
+              message: ""
             });
             this.searchList();
           } else if (res && res.code >= 100 && res.code <= 104) {
@@ -469,15 +453,15 @@ export default {
       });
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
-        console.log("11111111",this.tableData)
-        this.tableData.forEach((a) => {
+        console.log("11111111", this.tableData);
+        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();
@@ -495,8 +479,8 @@ export default {
       this.pageInfo.curr = 1;
       this.parmValue.page = 1;
       await this.searchList();
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/goodStore/goodsCost/components/addEdit.vue

@@ -73,13 +73,26 @@
           >
             <el-row style="padding-bottom">
               <el-col :span="8">
+                <el-form-item label="对接平台" prop="platform_type">
+                  <el-select
+                    placeholder="对接平台"
+                    style="width:100%"
+                    v-model="ruleForm.platform_type"
+                    @change="ruleForm.platform = ''"
+                  >
+                    <el-option label="有赞平台" value="1" />
+                    <el-option label="无对接" value="0" />
+                  </el-select>
+                </el-form-item>
+
                 <el-form-item label="所属平台" prop="platform">
                   <search-terrace
                     :value="ruleForm.platform"
                     :is_show="'1'"
-                    :disabled="false"
+                    :disabled="!ruleForm.platform_type"
                     :is-detail="false"
                     :placeholder="'所属平台'"
+                    :platformType="ruleForm.platform_type"
                     @searchChange="platform_codesearchChange"
                   />
                 </el-form-item>
@@ -94,7 +107,8 @@
                     />
                   </el-select>
                 </el-form-item>
-
+              </el-col>
+              <el-col :span="16" style="text-align: right">
                 <el-form-item label="上线原因" prop="online_reason">
                   <el-input
                     v-model="ruleForm.online_reason"
@@ -103,8 +117,7 @@
                     maxlength="200"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col :span="16" style="text-align: right">
+
                 <el-form-item label="上线备注" prop="online_remark">
                   <el-input
                     v-model="ruleForm.online_remark"
@@ -144,6 +157,7 @@ export default {
       isYZPlatform: false,
       showModelThis: this.showModel,
       ruleForm: {
+        platform_type: "",
         platform: "", // string	平台id
         is_fixed: "", // string 定价模式
         online_reason: "", // string	上线原因
@@ -156,6 +170,13 @@ export default {
       ],
       rulesThis: this.rules,
       rules: {
+        platform_type: [
+          {
+            required: true,
+            message: "请选择对接平台",
+            trigger: "change"
+          }
+        ],
         platform: [
           {
             required: true,
@@ -189,7 +210,11 @@ export default {
   },
   computed: {
     isFiexed() {
-      return !this.isYZPlatform && this.isNobleMetal;
+      return (
+        !this.isYZPlatform &&
+        this.isNobleMetal &&
+        this.ruleForm.platform_type !== "1"
+      );
     },
     pricingOptions() {
       return [
@@ -230,6 +255,7 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
+            platform_type: "",
             platform: "", // string	平台id
             online_reason: "", // string	上线原因
             online_remark: "" // string	上线备注

src/views/goodStore/goodsCost/index.vue

@@ -133,28 +133,6 @@
               </el-select>
             </el-col>
 
-            <!-- <el-col :span="4" style="width: 147px; padding: 0 0 0 10px">
-              <el-select
-                v-model="parmValue.has_account"
-                filterable
-                clearable
-                :size="searchSize"
-                placeholder="供应商账号"
-                style="width: 100%"
-                @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              >
-                <el-option
-                  v-for="item in has_account_list"
-                  :key="'status' + item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-col>-->
             <el-col :span="3" style="margin: 0 10px">
               <search-supplier
                 :size="'mini'"
@@ -512,7 +490,7 @@ export default {
       }
     };
     return {
-      isNobleMetal:false,
+      isNobleMetal: false,
       dialogFormVisible: false,
       has_account_list,
       donline_formStOps: [],
@@ -949,31 +927,42 @@ export default {
         return;
       }
 
-      const categoryIds = this.changeList.map(({cat_info, is_gold_price}) => ({
-        id: String(cat_info[0].id),
-        isGoldPrice: String(is_gold_price)
-      }))
+      const categoryIds = this.changeList.map(
+        ({ cat_info, is_gold_price }) => ({
+          id: String(cat_info[0].id),
+          isGoldPrice: String(is_gold_price)
+        })
+      );
 
-      const nobleMetalIds = categoryIds.filter(({ id, isGoldPrice }
-      ) => id === '6' && isGoldPrice === "1")
+      const nobleMetalIds = categoryIds.filter(
+        ({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1"
+      );
 
-      if(nobleMetalIds.length > 0 && categoryIds.length !== nobleMetalIds.length){
+      if (
+        nobleMetalIds.length > 0 &&
+        categoryIds.length !== nobleMetalIds.length
+      ) {
         const h = this.$createElement;
 
         this.$message({
-          message: h('p', null, [
-            h('span', null, '勾选商品必须全部为'),
-            h('i', { style: 'color: red' }, '开启实时金价贵金属商品'),
-            h('span', null, '或者全部为'),
-            h('i', { style: 'color: red' }, '未开启实时金价的贵金属商品和非贵金属商品')
+          message: h("p", null, [
+            h("span", null, "勾选商品必须全部为"),
+            h("i", { style: "color: red" }, "开启实时金价贵金属商品"),
+            h("span", null, "或者全部为"),
+            h(
+              "i",
+              { style: "color: red" },
+              "未开启实时金价的贵金属商品和非贵金属商品"
+            )
           ]),
-          type: 'warning',
+          type: "warning",
           dangerouslyUseHTMLString: true
-        })
-        return
+        });
+        return;
       }
 
-      this.isNobleMetal = nobleMetalIds.length > 0 && categoryIds.length === nobleMetalIds.length;
+      this.isNobleMetal =
+        nobleMetalIds.length > 0 && categoryIds.length === nobleMetalIds.length;
 
       let isok = true;
       this.changeList.forEach(e => {

src/views/goodStore/goodsOnline/add.vue

@@ -13,14 +13,27 @@
       >
         <el-row>
           <el-col :span="8">
+            <el-form-item label="对接平台" prop="platform_type">
+              <el-select
+                placeholder="对接平台"
+                style="width:100%"
+                v-model="ruleForm.platform_type"
+                @change="ruleForm.platform = ''"
+              >
+                <el-option label="有赞平台" value="1" />
+                <el-option label="无对接" value="0" />
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="所属平台" prop="platform">
               <search-terrace
                 :value="ruleForm.platform"
-                :disabled="false"
+                :disabled="!ruleForm.platform_type"
                 :size="'mini'"
                 :is_show="'1'"
                 :isDetail="false"
                 :placeholder="'所属平台'"
+                :platformType="ruleForm.platform_type"
                 @searchChange="platform_codesearchChange"
               />
             </el-form-item>
@@ -35,7 +48,8 @@
                 />
               </el-select>
             </el-form-item>
-
+          </el-col>
+          <el-col :span="16">
             <el-form-item label="上线原因" prop="online_reason">
               <el-input
                 :disabled="false"
@@ -44,8 +58,7 @@
                 maxlength="200"
               />
             </el-form-item>
-          </el-col>
-          <el-col :span="16">
+
             <el-form-item label="上线备注" prop="online_remark">
               <el-input
                 type="textarea"
@@ -163,7 +176,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     isFiexed() {
-      return !this.isYzPlatform && this.isNoble;
+      return (
+        !this.isYzPlatform &&
+        this.isNoble &&
+        this.ruleForm.platform_type !== "1"
+      );
     },
     powers() {
       const tran =
@@ -201,7 +218,16 @@ export default {
       costsitem: {},
       showModel: false,
       status: "",
-      rulesThis: this.rules,
+      rulesThis: {
+        ...this.rules,
+        platform_type: [
+          {
+            required: true,
+            message: "请选择对接平台",
+            trigger: "change"
+          }
+        ]
+      },
       activeName: "1",
       isYzPlatform: false,
       loading: true,
@@ -332,6 +358,7 @@ export default {
 
     resetFormData() {
       this.ruleForm = {
+        platform_type: "",
         is_fixed: "",
         platform: "", //string	平台id
         codes: [], //string	无

src/views/goodStore/goodsOnline/columns.js

@@ -167,6 +167,13 @@ const listCol = [
   }
 ]
 const rules = {
+  platform_type: [
+    {
+      required: true,
+      message: "请选择对接平台",
+      trigger: "change"
+    }
+  ],
   is_fixed:[
     {
       required: true,

src/views/sellOut/salesOrder/detail.vue

@@ -2,15 +2,15 @@
   <div class="salesOrderDetail pagePadding">
     <div style="width: 100%" v-if="powers.some((i) => i == '007')">
       <div style="height: 30px" v-if="queryType !== 'add'">
-        <span>订单编号：</span><span v-if="sitem">{{ sitem.orderCode }}</span>
+        <span>订单编号：</span>
+        <span v-if="sitem">{{ sitem.orderCode }}</span>
         <el-button
           style="margin: 0 0 0 10px"
           class="fr"
           type="primary"
           :size="'mini'"
           @click="setShowModel = true"
-          >设置部分字段
-        </el-button>
+        >设置部分字段</el-button>
       </div>
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="新建销售订单" name="0" v-if="queryType === 'add'">
@@ -71,7 +71,8 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>销售方公司编号：</span><span>{{ sitem.supplierNo }}</span>
+                        <span>销售方公司编号：</span>
+                        <span>{{ sitem.supplierNo }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -82,25 +83,24 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>购买方公司编号：</span
-                        ><span>{{ sitem.customer_code }}</span>
+                        <span>购买方公司编号：</span>
+                        <span>{{ sitem.customer_code }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
                 <template slot="is_active">
-                    <span >{{ sitem.is_activity + "" === "1" ? "参与活动" : "不参与活动" }}
-                    </span>
-                    <span v-if="sitem.is_activity + '' === '0'">
-                      /{{
-                        (
-                          goodtype_options.find(
-                            (item) => item.value == sitem.good_type
-                          ) || {}
-                        ).label || "--"
-                      }}
-                    </span>
+                  <span>{{ sitem.is_activity + "" === "1" ? "参与活动" : "不参与活动" }}</span>
+                  <span v-if="sitem.is_activity + '' === '0'">
+                    /{{
+                    (
+                    goodtype_options.find(
+                    (item) => item.value == sitem.good_type
+                    ) || {}
+                    ).label || "--"
+                    }}
+                  </span>
                 </template>
                 <template slot="proof_id">
                   <el-popover
@@ -111,8 +111,7 @@
                   >
                     <video width="275" controls class="fl">
                       <source :src="sitem.proof_url" type="video/mp4" />
-                      <source :src="sitem.proof_url" type="video/avi" />
-                      您的浏览器不支持Video标签。
+                      <source :src="sitem.proof_url" type="video/avi" />您的浏览器不支持Video标签。
                     </video>
                     <i
                       class="el-icon-video-camera-solid hover"
@@ -133,22 +132,27 @@
                     v-else-if="sitem.proof_type + '' === '3'"
                     :href="sitem.proof_url"
                     download="凭证文件"
-                    >点击下载</a
-                  >
+                  >点击下载</a>
                   <span v-else>暂无凭证</span>
                 </template>
                 <template slot="send_type">
-                  <el-tag :size="'mini'">{{
+                  <el-tag :size="'mini'">
+                    {{
                     sitem.send_type + "" === "1"
-                      ? "有地址下单"
-                      : sitem.send_type + "" === "2"
-                      ? "无地址下单"
-                      : "--"
-                  }}</el-tag>
+                    ? "有地址下单"
+                    : sitem.send_type + "" === "2"
+                    ? "无地址下单"
+                    : "--"
+                    }}
+                  </el-tag>
                 </template>
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item title="商品信息" name="2" v-if="sitem && String(sitem.order_source) !== '9'">
+            <el-collapse-item
+              title="商品信息"
+              name="2"
+              v-if="sitem && String(sitem.order_source) !== '9'"
+            >
               <show-goods-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -157,7 +161,7 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
-            <!-- TODO:修改 -->
+
             <el-collapse-item title="发货单" name="3">
               <order-out-table
                 :newTime="newTime"
@@ -169,9 +173,8 @@
             </el-collapse-item>
 
             <el-collapse-item title="发货工单" name="4">
-              <child-list v-if="newTime !== ''" :sitem="sitem"  />
+              <child-list v-if="newTime !== ''" :sitem="sitem" />
             </el-collapse-item>
-
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
@@ -188,14 +191,6 @@
         </el-tab-pane>
       </el-tabs>
 
-      <!-- <edit-add
-        :id="modelId"
-        :sitem="sitem"
-        :show-model="showModell"
-        :is-detail="isDetail"
-        @refresh="searchList"
-        @cancel="showModel = false"
-      /> -->
       <set-partial
         :sitem="sitem"
         :show-model="setShowModel"
@@ -214,10 +209,13 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
 import addForm from "./components/addForm";
 import orderOutTable from "./components/order-out-table";
-import ChildList from "./components/child-list.vue"
+import ChildList from "./components/child-list.vue";
 import { showColumns } from "./components/ShowDataTableColumns";
 import setPartial from "./setPartial";
-import { xs_order_source_options, xs_order_type_options } from "@/assets/js/statusList";
+import {
+  xs_order_source_options,
+  xs_order_type_options
+} from "@/assets/js/statusList";
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
@@ -231,11 +229,11 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "salesOrderDetail"
+          item => item.menu_route == "salesOrderDetail"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];
-    },
+    }
   },
   data() {
     return {
@@ -247,16 +245,16 @@ export default {
       goodtype_options: [
         {
           value: "1",
-          label: "常规商品",
+          label: "常规商品"
         },
         {
           value: "2",
-          label: "赠品",
+          label: "赠品"
         },
         {
           value: "3",
-          label: "样品",
-        },
+          label: "样品"
+        }
       ],
       xs_order_type_options,
       xs_order_source_options,
@@ -264,7 +262,7 @@ export default {
         { value: "0", label: "待发货" },
         { value: "1", label: "待发货完成" },
         { value: "2", label: "发货已完成" },
-        { value: "3", label: "订单已取消" },
+        { value: "3", label: "订单已取消" }
       ],
       sitem: null,
 
@@ -273,7 +271,7 @@ export default {
       newTime: "",
       loading: false,
       queryId: "",
-      queryType: "",
+      queryType: ""
     };
   },
   mounted() {
@@ -296,7 +294,7 @@ export default {
       await this.$confirm(`确定要${message}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(async () => {
           if (status + "" === "-1") {
@@ -318,7 +316,7 @@ export default {
       if (res && res.code === 0) {
         this.$notify.success({
           title: message + "成功！",
-          message: "",
+          message: ""
         });
 
         this.routeGoto("check", {});
@@ -333,14 +331,14 @@ export default {
       let model = {
         id: this.queryId,
         remark: remark || "",
-        status: status,
+        status: status
       };
       const res = await asyncRequest.status(model);
       this.loading = false;
       if (res && res.code === 0) {
         this.$notify.success({
           title: message + "成功！",
-          message: "",
+          message: ""
         });
         this.initData();
       } else if (res && res.code >= 100 && res.code <= 104) {
@@ -369,8 +367,8 @@ export default {
         this.$message.warning(res.message);
       }
       this.loading = false;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>