bug修改，增加新的页面

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

@@ -0,0 +1,39 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "cgdlist", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "cgdinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "cgdedit", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "cgdstatus", data, "post", params),
+  // 新建入库单
+  orderinadd: (data, params) => http(api + "orderinadd", data, "post", params),
+  // 新建入库单详情
+  orderininfo: (data, params) => http(api + "orderininfo", data, "post", params),
+  // 异常原因列表
+  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
+  // 入库单验货
+  orderincheck: (data, params) => http(api + "orderincheck", data, "post", params),
+  // 入库单退货换货
+  orderinreturn: (data, params) => http(api + "orderinreturn", data, "post", params),
+  // 发货单状态修改
+  orderinstatus: (data, params) => http(api + "orderinstatus", data, "post", params),
+  // 采返商品详情
+  re_detail: (data, params) => http(api + "goodzxinfo", data, "post", params),
+  //商品成本详情
+  cost_detail: (data, params) => http(api + "goodupinfo", data, "post", params),
+
+  //采购单修改实时金价
+  cgdeditgoldprice: (data, params) => http(api + "cgdeditgoldprice", data, "post", params),
+   // 采返商品详情 订单生成前
+   cove_detail: (data, params) => http(api + "getgoodzxinfobynotzixun", data, "post", params),
+   //导出
+   exportcgdlist: (data, params) => http(api + "exportcgdlist", data, "post", params),
+}

src/config/env.development.js

@@ -9,6 +9,7 @@ module.exports = {
 
     // userApi: 'http://inv.test241.wanyuhengtong.com/',
     // baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    
     userApi: 'http://inv.sitw.wanyuhengtong.com/',
     baseApi: 'http://stock.api.wanyuhengtong.com/',
   },

src/views/dataCorrection/cgMessage/columns.js

@@ -0,0 +1,192 @@
+const columns = [
+  // {
+  //   type: "expand",
+  //   _slot_: "expand",
+  //   fixed: "left",
+  //   _noset_: true,
+  // },
+  {
+    type: "selection",
+    fixed: "left",
+    _noset_: true
+  },
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "155px",
+  },
+  // {
+  //   prop: "bkcode",
+  //   label: "备库单编号",
+  //   width: "155px",
+  // },
+
+
+  // {
+  //   prop: "wsm_supplierNo",
+  //   label: "仓库公司编号",
+  //   width: "145px",
+  // },
+  // {
+  //   prop: "wsm_supplier",
+  //   label: "仓库公司名称",
+  //   width: "155px",
+  // },
+  // {
+  //   prop: "wsm_code",
+  //   label: "仓库编号",
+  //   width: "172px",
+  // },
+  // {
+  //   prop: "wsm_name",
+  //   label: "仓库名称",
+  //   width: "80px",
+  // },
+  {
+    prop: "spuCode",
+    label: "商品成本编号",
+    width: "158px",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+    'min-width': "145px",
+  },
+
+
+  // 
+  // {
+  //   prop: "apply_name",
+  //   label: "申请人",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "sendtime",
+  //   label: "发货时间",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "send_num",
+  //   label: "发货数量",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "post_company",
+  //   label: "物流公司",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "post_code",
+  //   label: "物流单号",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "post_fee",
+  //   label: "物流费用",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "wsm_num",
+  //   label: "入库数量",
+  //   width: "60px",
+  // },
+  //  {
+  //   prop: "error_num",
+  //   label: "异常数量",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "check_name",
+  //   label: "验货人",
+  //   width: "60px",
+  // },
+  // 
+  {
+    prop: "good_price",
+    label: "单价",
+    width: "110px",
+  },
+  {
+    prop: "good_num",
+    label: "数量",
+    width: "110px",
+  },
+  {
+    prop: "total_fee",
+    label: "总货款",
+    width: "110px",
+  },
+  // {
+  //   prop: "send_num",
+  //   label: "已发货数量",
+  //   width: "110px",
+  // },
+  // {
+  //   prop: "wsend_num",
+  //   label: "未发货数量",
+  //   width: "105px",
+  // },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
+  },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    width: "110px",
+  },
+  
+  {
+    prop: "lasttime",
+    label: "预计最晚入库时间",
+    width: "145px",
+  },
+  {
+    prop: "supplierNo",
+    label: "采购供应商编号",
+    width: "145px",
+  },
+  {
+    prop: "supplier_name",
+    label: "采购供应商名称",
+    width: "155px",
+  },
+  {
+    prop: "cgder",
+    label: "采购员",
+    width: "60px",
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "145px",
+  }
+
+]
+const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
+  { value: "1", label: "待入库" },
+  { value: "2", label: "部分入库" },
+  { value: "3", label: "入库完成" },
+  { value: "4", label: "已取消订单" },
+];
+const order_type_options = [
+  {
+    value: "1",
+    label: "备货单",
+  },
+  {
+    value: "2",
+    label: "线上非库存品",
+  },
+  {
+    value: "3",
+    label: "咨询采返",
+  },
+  { value: "4", label: "项目采返" },
+];
+export { columns, statusOptions, order_type_options }

src/views/dataCorrection/cgMessage/components/ShowDataTableColumns.js

@@ -0,0 +1,81 @@
+export default [
+  {
+    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
+  },
+  {
+    prop: "gold_price",
+    label: "当前实时金价",
+    _slot_: "gold_price",
+    span: 24
+  },
+]
+

src/views/dataCorrection/cgMessage/components/columns-table.js

@@ -0,0 +1,101 @@
+
+export default {
+  tableFormThis: {
+    post_company: [
+      {
+        required: false,
+        message: "",
+        trigger: "blur",
+      },
+    ],
+    post_code: [
+      {
+        required: false,
+        message: "",
+        trigger: "blur",
+      },
+    ],
+    post_fee: [
+      {
+        required: false,
+        message: "",
+        trigger: "blur",
+      },
+    ],
+    sendtime: [
+      {
+        required: false,
+        message: "",
+        trigger: "blur",
+      },
+    ],
+    send_num: [
+      {
+        required: false,
+        message: "",
+        trigger: "blur",
+      },
+    ],
+    status: [
+      {
+        required: false,
+        message: "",
+        trigger: "change",
+      },
+    ],
+    error_remark: [
+      {
+        required: false,
+        message: "",
+        trigger: "blur",
+      },
+    ],
+  },
+
+  columns: [
+    // 表格 - 列参数
+
+    {
+      prop: "wsm_in_code",
+      label: "入库单编号",
+      width: "155",
+    },
+    {
+      prop: "sendtype_name",
+      label: "发货方式",
+      width: "90",
+    },
+
+    {
+      prop: "post_fee",
+      label: "快递费用",
+      width: "100",
+    },
+
+    {
+      prop: "send_num",
+      label: "发货数量",
+      width: "110",
+    },
+    {
+      prop: "status_name",
+      label: "入库状态",
+      width: "120",
+    },
+
+    {
+      prop: "post_company",
+      label: "快递公司",
+      width: "125",
+    },
+    {
+      prop: "post_code",
+      label: "快递单号",
+    },
+    {
+      prop: "sendtime",
+      label: "发货时间",
+      width: "145",
+    },
+  ]
+}

src/views/dataCorrection/cgMessage/components/editPrice.vue

@@ -0,0 +1,204 @@
+<template>
+  <el-form
+    ref="ruleForm"
+    :model="ruleForm"
+    status-icon
+   
+    :size="'mini'"
+    :rules="rulesThis"
+    label-width="112px"
+  >
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="实时金价" prop="gold_price">
+          <digital-input
+            :values="ruleForm.gold_price"
+            :placeholder="'修改实时金价'"
+            :min="0"
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :newTime="newTime"
+            :controls="false"
+            :append="'元'"
+            @reschange="rate_change"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col
+        :span="12"
+        style="text-align: right"
+        
+      >
+        <el-button type="primary" :size="'mini'" @click="submitForm"
+          >保 存
+        </el-button>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+import resToken from "@/mixins/resToken";
+
+export default {
+  name: "Account",
+  props: ["showModel", "sitem", "id", "type",'newTime',"cost_detailArr"],
+  mixins: [resToken],
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "projectDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  watch: {
+    // showModel: function (val) {
+    //   this.showModelThis = val;
+    //   if (val) {
+    //     this.initForm();
+    //   }
+    // },
+    //    newTime: function (val) {
+    //   if (val) {
+    //     this.initForm();
+    //   }
+    // },
+  },
+  data() {
+    const validate_sale_price = (rule, value, callback) => {
+      if (value === "" || value === undefined) {
+        callback(new Error("实时金价不能为空！"));
+      } else if (
+        value === "0" ||
+        value === "0." ||
+        value === "0.0" ||
+        value === "0.00"
+      ) {
+        callback(new Error("实时金价不能为零！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      cost_detailArr:[],
+      loading: false,
+      ruleForm: {
+        cgdNo: "",
+        gold_price: "0",
+      },
+      rulesThis: this.rules,
+      rules: {
+        gold_price: [
+          {
+            required: true,
+            validator: validate_sale_price,
+            trigger: "blur",
+          },
+        ],
+      },
+      newTime:""
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    //项目毛利率编辑
+    rate_change(e) {
+      this.ruleForm.gold_price = e ;
+      this.ruleForm.cgdNo = this.sitem.cgdNo;
+
+      
+      
+      
+      this.$refs.ruleForm.validateField("gold_price");
+    },
+
+    //初始化整个组件
+    async initForm() {
+      // this.loading = true;
+      console.log(this.sitem)
+      this.company = "";
+      
+      this.ruleForm = {
+        cgdNo: this.sitem.cgdNo,
+        gold_price: this.sitem.gold_price,
+      };
+      console.log(this.ruleForm )
+      this.rulesThis = this.rules;
+      this.newTime = new Date().valueOf()+""
+      console.log(this.newTime )
+
+      //新增商品信息请求
+      // const res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      // if (res && res.code === 0 && res.data) {
+      //   this.cost_detailArr = res.data;
+      //   console.log(this.cost_detailArr)
+      // } else if (res && res.code >= 100 && res.code <= 104) {
+      //   await this.logout();
+      // } else {
+      //   this.$message.warning(res.message);
+      // }
+      
+      // this.loading = false;
+    },
+    //初始化整个表单
+    // async resetForm() {
+    //   // 重置
+    //   await this.$nextTick(() => {
+    //     if (this.$refs.ruleForm) {
+    //       this.$refs.ruleForm.resetFields();
+    //       this.$refs.ruleForm.clearValidate();
+    //       const { low_rate, cgdNo, status } = this.sitem;
+    //       this.status = status || "";
+    //       this.ruleForm = {
+    //         cgdNo: cgdNo || "",
+    //         gold_price: low_rate || "0",
+    //       };
+    //     }
+    //   });
+    // },
+
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        console.log(valid)
+        if (valid) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          let res = await asyncRequest.cgdeditgoldprice(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "修改成功！",
+              message: "",
+            });
+            this.showModelThis = false;
+            // // 刷新
+            this.$emit("refresh");
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+.account {
+}
+</style>

src/views/dataCorrection/cgMessage/components/order-in-table.vue

@@ -0,0 +1,287 @@
+<template>
+  <el-row class="addForm">
+    <el-col :span="24">
+      <el-form
+        :model="tableForm"
+        :rules="tableFormThis"
+        ref="tableForm"
+        :size="'mini'"
+        class="demo-tableForm product_go"
+      >
+        <el-table
+          :data="tableForm.product_go"
+          border
+          :size="'mini'"
+          row-key="key"
+        >
+          <template v-for="(item, index) in columns">
+            <el-table-column
+              :prop="item.prop"
+              show-overflow-tooltip
+              :label="item.label"
+              :width="item.width"
+              :min-width="item.minWidth"
+              :key="item.prop + index"
+            />
+          </template>
+
+          <el-table-column fixed="right" width="50">
+            <template slot="header" slot-scope="scope">
+              <el-tooltip
+                class="fr"
+                style="margin: 3px 0 0 0"
+                v-if="
+                  (status === '1' && powers.some((item) => item == '028')) ||
+                  (status === '2' && powers.some((item) => item == '028'))
+                "
+                effect="dark"
+                content="添加"
+                placement="top"
+              >
+                <i
+                  class="el-icon-circle-plus-outline tb-icon"
+                  style="color: #63cbe7"
+                  @click="openModal()"
+                ></i>
+              </el-tooltip>
+              <span v-else>操作</span>
+            </template>
+            <template slot-scope="scope">
+              <el-tooltip
+                v-if="powers.some((item) => item == '007')"
+                effect="dark"
+                content="详情"
+                placement="top"
+              >
+                <i
+                  class="el-icon-view tb-icon"
+                  @click="
+                    routeGoto('wsmInOrderDetail', {
+                      id: scope.row.wsm_in_code,
+                    })
+                  "
+                ></i>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <wsm-in-order-model
+        :show-model="showModel"
+        :sitem="modelSitem"
+        @refresh="(showModel = false), $emit('refresh')"
+        @cancel="showModel = false"
+      />
+    </el-col>
+  </el-row>
+</template>
+   <script>
+import asyncRequest from "@/apis/service/stock/allot/detail";
+import resToken from "@/mixins/resToken";
+import config from "./columns-table"; //表格列参数
+import wsmInOrderModel from "@/views/purchaseIn/wsmInOrder/components/wsm-in-order-model";
+export default {
+  name: "allot",
+  props: ["id", "sitem", "newTime"],
+  mixins: [resToken],
+  components: { wsmInOrderModel },
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "purchaseOrderDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      options: [],
+      status: "",
+      loading: false,
+      modelSitem: null,
+      wsm_in_code: "",
+      tableForm: {
+        product_go: [], //出库商品
+      },
+      tableFormThis: config.tableFormThis,
+      statusOptions: [
+        // { value: "0", label: "取消" },
+        {
+          value: "0",
+          label: "待发货",
+        },
+        {
+          value: "1",
+          label: "待验货",
+        },
+        {
+          value: "2",
+          label: "待审核",
+        },
+        {
+          value: "3",
+          label: "待入库",
+        },
+        {
+          value: "4",
+          label: "无退货入库成功",
+        },
+        // {
+        //   value: "5",
+        //   label: "退货成功",
+        // },
+      ],
+      columns: config.columns,
+    };
+  },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.modelSitem = null;
+      await this.resetForm();
+      this.loading = false;
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.tableForm) {
+          this.$refs.tableForm.resetFields();
+          this.$refs.tableForm.clearValidate();
+          const { status, child } = this.sitem;
+          this.status = status;
+
+          this.tableForm.product_go = child || [];
+          this.tableForm.product_go.forEach((e) => {
+            e.sendtype_name =
+              e.sendtype === "1"
+                ? "公司自提"
+                : e.sendtype === "2"
+                ? "供应商包邮"
+                : "--";
+            e.status_name =
+              (
+                this.statusOptions.find(
+                  (item) => item.value == e.status
+                ) || {}
+              ).label || "--";
+          });
+        }
+      });
+    },
+    openModal() {
+      this.modelSitem = this.sitem;
+      this.showModel = true;
+    },
+    async submitForm() {
+      let good = [];
+      this.loading = true;
+      good = this.getGoodList();
+      const model = {
+        allot_code: this.sitem.allot_code,
+        good: good,
+      };
+      let res = {};
+      if (this.status == "3") {
+        res = await asyncRequest.allotgetin(model);
+      } else {
+        res = await asyncRequest.allotvesio(model);
+      }
+
+      this.loading = false;
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title:
+            this.status == "3"
+              ? "入库方验货结果提交成功!"
+              : "入库方验货审核结果提交成功",
+          message: "",
+        });
+
+        this.$emit("refresh");
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+    //提交表单前 商品信息list 汇总
+    getGoodList() {
+      let oldList = JSON.parse(JSON.stringify(this.tableForm.product_go)),
+        resList = [];
+      oldList.forEach((v1) => {
+        let goodModel = {
+          good_code: v1.type_code,
+          usable_num: v1.usable_stock,
+          error_num: v1.error_num,
+          error_remark: v1.error_remark,
+          error_code: v1.error_code,
+        };
+        if (this.status === "4") {
+          goodModel.stock_num = v1.stock_num;
+        }
+
+        resList.push(goodModel);
+      });
+      return resList;
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.allot,
+.allotDetail {
+  .label-title-model {
+    line-height: 30px;
+    width: 100%;
+    color: #909399;
+    font-weight: bold;
+    font-size: 15px;
+    padding-bottom: 12px;
+    text-align: center;
+  }
+  .product_go {
+    .el-form-item--mini.el-form-item {
+      margin: 0 !important;
+      .spscope {
+        word-break: break-all !important;
+        line-height: 23px !important;
+        padding: 0 !important;
+        margin: 0 !important;
+        list-style: none !important;
+        font-style: normal !important;
+        text-decoration: none !important;
+        border: none !important;
+        display: inline-block !important;
+        font-weight: 500 !important;
+        font-family: "Microsoft Yahei", sans-serif !important;
+        -webkit-tap-highlight-color: transparent !important;
+        -webkit-font-smoothing: antialiased !important;
+        color: #606266 !important;
+        font-size: 12px !important;
+      }
+    }
+  }
+}
+</style>
+
+   

src/views/dataCorrection/cgMessage/components/rules.js

@@ -0,0 +1,119 @@
+import {
+    isnumber,
+    isnumber2
+} from "@/utils/validate";
+
+const validatePrice = (rule, value, callback) => {
+    if (value === "") {
+        callback(new Error("不能为空!"));
+    } else {
+        if (isnumber2(value)) {
+            callback();
+        } else if (isnumber(value)) {
+            callback();
+        } else {
+            callback(new Error("仅支持整数或两位小数!"))
+        }
+    }
+};
+const validateWeight = (rule, value, callback) => {
+    if (value === "") {
+        callback(new Error("不能为空!"));
+    } else {
+        if (!isnumber(value)) {
+            callback(new Error("仅支持整数!"))
+        } else {
+            callback();
+        }
+    }
+};
+export default {
+    good_price: {
+        required: true,
+        trigger: "blur",
+        validator: validatePrice,
+    },
+    nake_fee: {
+        required: true,
+        validator: validatePrice,
+
+        trigger: "blur",
+    },
+    supplierNo: {
+        type: "array",
+        required: true,
+        message: "采购供应商不能为空",
+        trigger: "change",
+
+    },
+    num: {
+        required: true,
+        validator: validateWeight,
+        trigger: "blur",
+    },
+    expecttime: {
+        required: true,
+        message: "预计入库时间不能为空",
+        trigger: 'blur',
+    },
+    weight: {
+        required: true,
+        validator: validateWeight,
+        trigger: "blur",
+    },
+    now_god_price: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    teach_fee: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    pakge_fee: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    mark_fee: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    cert_fee: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    delivery_fee: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    open_fee: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    purchase_num: {
+        required: true,
+        validator: validateWeight,
+        trigger: "blur",
+    },
+    diff_weight: {
+        required: true,
+        validator: validateWeight,
+        trigger: "blur",
+    },
+    diff_fee: {
+        required: true,
+        validator: validatePrice,
+        trigger: "blur",
+    },
+    remark: {
+        required: true,
+        message: "请填写备注",
+        trigger: "blur",
+    }
+}

src/views/dataCorrection/cgMessage/components/tolerance.vue

@@ -0,0 +1,95 @@
+<template>
+  <span>
+    <!-- {{ isshow + "" }}--{{ showBtn + "" }}--{{ order_type + "" }} -->
+    <el-button
+      v-show="isshow && showBtn && order_type && order_type !== '1'"
+      type="primary"
+      :size="'mini'"
+      class="fr"
+      style="margin: 0 0 0 12px"
+      @click="diffAdd = true"
+      >填写总工差</el-button
+    >
+    <add-edit-model
+      :sitem="showItem"
+      :show-model="diffAdd"
+      @refresh="initData"
+      @cancel="diffAdd = false"
+    />
+  </span>
+</template>
+
+<script>
+import addEditModel from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "tolerance",
+  components: {
+    addEditModel,
+  },
+  props: ["id", "sitem", "newTime", "showBtn"],
+  mixins: [resToken],
+  data() {
+    return {
+      diffAdd: false,
+      order_type: "",
+      spuCode: "",
+      is_noble: false,
+      isshow: false,
+      showItem: null,
+      cgdNo: "",
+    };
+  },
+  mounted() {
+    const { order_type, spuCode, cgdNo } = this.sitem;
+    this.order_type = order_type;
+    this.spuCode = spuCode;
+    this.cgdNo = cgdNo;
+    // this.queryId = this.$route.query.id;
+    this.initData();
+  },
+
+  methods: {
+    async initData() {
+      // console.log("111111");
+      let res = {};
+      if (this.order_type === "1" || this.order_type === "2") {
+        res = await asyncRequest.cost_detail({ spuCode: this.spuCode });
+      } else {
+        res = await asyncRequest.re_detail({ spuCode: this.spuCode });
+      }
+
+      const { code, data, message } = res;
+      if (code === 0) {
+        const { cat_info, is_diff, noble_weight } = data;
+        if (cat_info && cat_info.length > 0) {
+          cat_info.forEach((e) => {
+            if (e.id === "6") {
+              this.is_noble = true;
+            }
+          });
+        }
+        if (this.is_noble && is_diff === "1") {
+          this.isshow = true;
+          this.showItem = {
+            cgdNo: this.cgdNo,
+            good_num: this.sitem.good_num,
+            weight: noble_weight,
+          };
+        }
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    showDiffAdd() {
+      // diffAdd = true
+    },
+  },
+};
+</script>
+
+<style  lang="scss" scoped>
+</style>

src/views/dataCorrection/cgMessage/components/work-diff-table.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="work-diff-table">
+    <el-table
+      ref="addrForm"
+      :data="tableData"
+      border
+      :size="'mini'"
+      style="width: 100%"
+      row-key="key"
+    >
+      <el-table-column
+        show-overflow-tooltip
+        prop="diff_weight"
+        label="工差克重(g)"
+      />
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="diff_price"
+        label="工差金额"
+      />
+      <el-table-column show-overflow-tooltip prop="status" label="状态">
+        <template slot-scope="scope">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (
+                diffStatusOptions.find((item) => item.id == scope.row.status) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column show-overflow-tooltip prop="apply_name" label="创建人" />
+      <el-table-column show-overflow-tooltip prop="addtime" label="创建时间" />
+
+      <el-table-column fixed="right" width="50">
+        <template slot="header" slot-scope="scope">
+          <span>操作</span>
+        </template>
+
+        <template slot-scope="scope">
+          <el-tooltip
+            effect="dark"
+            content="查看"
+            v-if="!scope.row.edit"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="
+                routeGoto('purchaseDiffOrderDetail', {
+                  id: scope.row.id,
+                })
+              "
+            ></i>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+   <script>
+import resToken from "@/mixins/resToken";
+// import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
+// import outOrderAddModel from "./out-order-add-model";
+// import addEdit from "@/views/sellOut/sellAfterApply/components/addEdit.vue";
+
+import { mapGetters } from "vuex";
+
+export default {
+  name: "workDiffTable",
+  mixins: [resToken],
+  props: ["newTime", "id", "sitem"],
+  //   components: { addEdit, outOrderAddModel },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+  },
+
+  data() {
+    return {
+      orderCode: "",
+      outCode: "",
+      // 状态
+      statusOptions: [
+        { id: "1", label: "已出库" },
+        { id: "2", label: "验收中" },
+        { id: "3", label: "验收完成" },
+      ],
+      showGoodsModel: false,
+      stock_code: "",
+      tableData: [],
+      loading: false,
+      diffStatusOptions: [
+        { id: "1", label: "待业务部门审核" },
+        { id: "2", label: "工差单审核完成" },
+      ],
+      queryId: "",
+      status: "",
+      showModel: null,
+      modelId: "",
+      modelItem: null,
+      s_sitem: null,
+    };
+  },
+  mounted() {
+    // console.log(this.sitem);
+    // console.log(this.sitem.bum);
+    this.initForm();
+  },
+  methods: {
+    refresh() {
+      this.$emit("refresh");
+    },
+    async initForm() {
+      // console.log("12");
+      this.status = "";
+      this.queryId = this.$route.query.id;
+      // this.rulesThis = this.rules;
+      this.resetForm();
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        this.tableData = [];
+        const { purcheasediff } = this.sitem;
+        console.log(purcheasediff);
+        if (purcheasediff) {
+          this.tableData.push(purcheasediff);
+        }
+      });
+    },
+
+    editRow(index) {
+      let findex = this.stockForm.good_stock.findIndex((v) => v.edit === true);
+      if (findex !== -1) {
+        this.$message.warning("当前已有发货仓库信息在编辑，请保存后再试！");
+        return;
+      } else {
+        this.stockForm.good_stock[index].edit = true;
+      }
+    },
+    checkStockRow(index) {
+      let total = parseInt(this.stockForm.good_stock[index].usable_stock),
+        num = parseInt(this.stockForm.good_stock[index].num);
+      if (total === 0) {
+        this.$message.warning("该仓库已无该商品库存！不能销售！");
+        return;
+      } else {
+        if (num > total) {
+          this.$message.warning("销售数量不能大于可用库存！");
+          return;
+        } else {
+          this.stockForm.good_stock[index].edit = false;
+        }
+      }
+    },
+
+    openHouseModal() {
+      this.modelId = "add";
+      this.modelItem = this.sitem;
+      this.modelShowModel = true;
+    },
+
+    //省市区保存某一行
+    checkRow(rowIndex) {
+      this.$refs.addrForm.validate((valid) => {
+        if (valid) {
+          this.tableData[rowIndex].edit = false;
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    // 省市区删除行操作
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    // async submitForm() {
+    //   await this.$refs.ruleForm.validate(async (valid) => {
+    //     if (valid) {
+    //       this.loading = true;
+    //       const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
+    //       let model = {
+    //         id: this.queryId,
+    //         order_addr: [],
+    //       };
+    //       order_addr.forEach((v2) => {
+    //         let model2 = {
+    //           post_fee: v2.post_fee,
+    //           id: v2.id,
+    //         };
+    //         model.order_addr.push(model2);
+    //       });
+    //       let res = await asyncRequest.salefee(model);
+    //       this.loading = false;
+    //       if (res && res.code === 0) {
+    //         this.$notify.success({
+    //           title: "反馈物流费用成功！",
+    //           message: "",
+    //         });
+    //         this.showModelThis = false;
+    //         // 刷新
+    //         this.$emit("refresh");
+    //       } else if (res && res.code >= 100 && res.code <= 104) {
+    //         await this.logout();
+    //       } else {
+    //         this.$message.warning(res.message);
+    //       }
+    //     } else {
+    //       console.log("error submit!!");
+    //       return false;
+    //     }
+    //   });
+    // },
+    openModal(code, sitem, outcode) {
+      console.log(sitem);
+      this.s_sitem = sitem;
+      this.modelId = code;
+      this.showModel = true;
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+</style>

src/views/dataCorrection/cgMessage/index.vue

@@ -0,0 +1,833 @@
+<template>
+  <div class="pagePadding" style="background:#f7f7f7">
+    <div
+      class="box"
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+    >
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        label-width="100px"
+        class="demo-ruleForm"
+      >
+        <el-form-item
+          label="采购单编号: "
+          prop="name"
+          style="width: 500px"
+          class="title"   
+        >
+          <el-input
+            v-model="ruleForm.name"
+            readonly="true"
+            placeholder="请选择"
+            @click.native="centerDialogVisible = true"
+          ></el-input>
+        </el-form-item>
+
+        <div class="con" v-if="sitem">
+              <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+              <el-collapse-item title="采购单信息" name="1">
+                <show-data-table
+                  :newTime="newTime"
+                  v-if="newTime !== ''"
+                  :sitem="sitem"
+                  :columns="ShowDataTableColumns"
+                >
+                  <template slot="supplier_name">
+                    <span>{{ sitem.supplier_name }}</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="company">
+                    <span>{{ sitem.company }}</span>
+                    <el-popover placement="top" width="300" trigger="hover">
+                      <ul>
+                        <li>
+                          <span>购买方公司编号：</span
+                          ><span>{{ sitem.companyNo }}</span>
+                        </li>
+                      </ul>
+                      <i class="el-icon-warning-outline fr" slot="reference"></i>
+                    </el-popover>
+                  </template>
+
+                  <template slot="status">
+                    <el-tag
+                      :size="'mini'"
+                      :type="sitem.status == '0' ? 'warning' : ''"
+                      v-text="
+                        (
+                          statusOptions.find(
+                            (item) => item.value == sitem.status
+                          ) || {}
+                        ).label || '--'
+                      "
+                    ></el-tag>
+                    <el-tooltip
+                      class="fr"
+                      v-if="
+                        powers.some((item) => item == '007') &&
+                        sitem.status === '0'
+                      "
+                      effect="dark"
+                      content="已于供应商确认"
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-video-play tb-icon"
+                        @click="statusConfirm()"
+                      ></i>
+                    </el-tooltip>
+                  </template>
+                  <template slot="order_type">
+                    <el-tag
+                      :size="'mini'"
+                      v-text="
+                        (
+                          order_type_options.find(
+                            (item) => item.value == sitem.order_type
+                          ) || {}
+                        ).label || '--'
+                      "
+                    ></el-tag>
+                    <el-popover
+                      placement="top"
+                      width="300"
+                      v-if="sitem.order_type === '1'"
+                      trigger="hover"
+                    >
+                      <ul>
+                        <li>
+                          <span>备库单编号：</span><span>{{ sitem.bkcode }}</span>
+                        </li>
+                      </ul>
+                      <i class="el-icon-warning-outline fr" slot="reference"></i>
+                    </el-popover>
+                  </template>
+
+                  <template slot="wsm">
+                    <span>{{ sitem.wsm_supplier }}/{{ 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>
+                        </li>
+                      </ul>
+                      <i class="el-icon-warning-outline fr" slot="reference"></i>
+                    </el-popover>
+                  </template>
+
+                  <template slot="gold_price">
+                    <div
+                      v-if="
+                        sitem.status == '0' &&
+                        sitem.can[0].id == '6' &&
+                        cost_detailArr.is_gold_price == '1'
+                      "
+                    >
+                      {{ sitem.gold_price }}
+                    </div>
+                    <div v-else>----</div>
+                  </template>
+                </show-data-table>
+              </el-collapse-item>
+              <!-- <el-collapse-item title="商品信息" name="2">
+                <show-goods-data-table
+                  :newTime="newTime"
+                  v-if="newTime !== ''"
+                  :type="sitem.order_type"
+                  :skucode="sitem.skuCode"
+                  :spucode="sitem.spuCode"
+                  :iscgd="true"
+                />
+
+                <editPrice
+                  :newTime="newTime"
+                  v-if="
+                    newTime !== '' &&
+                    sitem.status == '0' &&
+                    sitem.can[0].id == '6' &&
+                    cost_detailArr.is_gold_price == '1'
+                  "
+                  :sitem="sitem"
+                  :cost_detailArr="cost_detailArr"
+                  @refresh="refresh"
+                >
+                </editPrice>
+              </el-collapse-item>
+              <el-collapse-item
+                title="入库单"
+                name="3"
+                v-if="sitem && sitem.status !== '0'"
+              >
+                <order-in-table
+                  :newTime="newTime"
+                  v-if="newTime !== ''"
+                  :sitem="sitem"
+                  :id="queryId"
+                  @refresh="initData()"
+                />
+              </el-collapse-item>
+              <el-collapse-item
+                title="工差单"
+                name="4"
+                v-if="
+                  sitem &&
+                  sitem.order_type !== '1' &&
+                  sitem.status !== '0' &&
+                  sitem.purcheasediff
+                "
+              >
+                <work-diff-table
+                  :newTime="newTime"
+                  v-if="newTime !== ''"
+                  :sitem="sitem"
+                />
+              </el-collapse-item> -->
+          </el-collapse>
+        </div>
+      </el-form>
+
+      <el-dialog
+        title="采购单详情"
+        :visible.sync="centerDialogVisible"
+        width="1040px"
+        top="2.5vh"
+        center
+      >
+        <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();
+          "
+          @selection="selection_change"
+        >
+          <template #table-header="{}">
+            <div style="width: 100%">
+              <el-row style="padding: 0 0 0 80px">
+                <el-col :span="4" style="width: 150px">
+                  <el-select
+                    :size="searchSize"
+                    v-model="parmValue.status"
+                    filterable
+                    clearable
+                    disabled
+                    placeholder="采购单状态"
+                    style="width: 100%"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                    <el-option
+                      v-for="item in statusOptions"
+                      :key="'status' + item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-col>
+                <!-- <el-col :span="4" style="width: 310px; padding: 0 0 0 10px">
+                <search-supplier
+                  :size="searchSize"
+                  :value="wsm_supplierNo"
+                  :placeholder="'入库公司名称'"
+                  :disabled="false"
+                  :names="supplierName"
+                  :isDetail="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+              <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
+                <search-stock
+                  :size="searchSize"
+                  :value="wsm_code"
+                  :placeholder="'入库仓库名称'"
+                  :disabled="false"
+                  :names="stockName"
+
+                  :isDetail="true"
+                  :isRelation="true"
+                  :companyCode="parmValue.wsm_supplierNo"
+                  @searchChange="stockChange"
+                />
+              </el-col> -->
+                <el-col :span="4" style="width: 130px; padding: 0 0 0 10px">
+                  <el-dropdown
+                    @command="handleClick($event)"
+                    :size="searchSize"
+                  >
+                    <el-button :size="searchSize" style="width: 120px">
+                      {{ sselect }}
+                      <i
+                        class="el-icon-arrow-down el-icon--right"
+                        :size="searchSize"
+                      ></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <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 :span="4" style="width: 303px; padding: 0 0 0 10px">
+                  <period-date-picker
+                    :type="1"
+                    :width="'135px'"
+                    :size="searchSize"
+                    :start="timeOBJ.start"
+                    :end="timeOBJ.end"
+                    @timeReturned="handleTime"
+                  />
+                </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: 500px; padding: 0 0 0 0px">
+                  <el-input
+                    clearable
+                    placeholder="关键字"
+                    v-model="input"
+                    maxlength="40"
+                    :size="searchSize"
+                    class="input-with-select"
+                    @blur="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                    <el-select
+                      v-model="select"
+                      style="width: 125px"
+                      slot="prepend"
+                      placeholder="关键字类型"
+                      @change="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                    >
+                      <el-option label="采购单编号" value="1"></el-option>
+                      <!-- <el-option label="入库单编号" value="2"></el-option> -->
+                      <!-- 列表未渲染备库编号，注释 -->
+                      <!-- <el-option label="备库编号" value="3"></el-option> -->
+                      <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-select>
+                  </el-input>
+                </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"
+                  v-if="
+                    powers &&
+                    powers.length > 0 &&
+                    powers.some((item) => item == '087')
+                  "
+                >
+                  <el-button
+                    type="primary"
+                    style="margin-left: 30px"
+                    @click="submit"
+                    :size="searchSize"
+                    class="fr"
+                  >
+                    提交
+                  </el-button>
+                </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">
+              {{ i === 0 ? "__" : "--" }}{{ si.spec_name }}[{{ si.spec_value }}]
+            </span>
+          </template>
+          <template #status="{ scope }">
+            <el-tag
+              :size="tablebtnSize"
+              v-text="
+                (
+                  statusOptions.find(
+                    (item) => item.value == scope.row.status
+                  ) || {}
+                ).label || '--'
+              "
+            ></el-tag>
+          </template>
+          <template #order_type="{ scope }">
+            <el-tag
+              :size="tablebtnSize"
+              v-text="
+                (
+                  order_type_options.find(
+                    (item) => item.value == scope.row.order_type
+                  ) || {}
+                ).label || '--'
+              "
+            ></el-tag>
+          </template>
+          <template #operation="{ scope }">
+            <el-tooltip
+              v-if="powers.some((item) => item == '007')"
+              effect="dark"
+              content="详情"
+              placement="top"
+            >
+              <i
+                class="el-icon-view tb-icon"
+                @click="getRouter('purchaseOrderDetail', scope.row.cgdNo)"
+              ></i>
+            </el-tooltip>
+          </template>
+        </ex-table>
+      </el-dialog>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+
+<script>
+//http
+import asyncRequest from "@/apis/service/dataCorrection/cgMessage";
+
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import urlConfig from "@/apis/url-config";
+import { columns, order_type_options, statusOptions } from "./columns";
+import { mapGetters } from "vuex";
+import orderInTable from "./components/order-in-table";
+import workDiffTable from "./components/work-diff-table";
+import ShowDataTableColumns from "./components/ShowDataTableColumns";
+import tolerance from "./components/tolerance";
+import editPrice from "./components/editPrice";
+export default {
+  mixins: [mixinPage, resToken],
+  components: {
+    orderInTable,
+    tolerance,
+    workDiffTable,
+    editPrice,
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "purchaseOrder"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    var validate = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请选择采购单"));
+      } else {
+        if (this.ruleForm.checkPass !== "") {
+          this.$refs.ruleForm.validateField("checkPass");
+        }
+        callback();
+      }
+    };
+    return {
+      //弹窗显隐
+      centerDialogVisible: false,
+      ruleForm: {
+        name: "",
+      },
+      rules: {
+        name: [{ validator: validate, required: true, trigger: "blur" }],
+      },
+
+      //入库公司
+      supplierName: "",
+      //入库仓库
+      stockName: "",
+      changeList: [],
+      fileUrl: urlConfig.baseURL,
+      activeNames: ["0", "1", "2", "3", "4", "5", "10"],
+      sitem: null,
+      select: "1",
+      input: "",
+      timeOBJ: {
+        start: "", //起始时间
+        end: "", // 结束时间
+      },
+      options: ["创建时间", "最晚入库时间"],
+      sselect: "创建时间",
+      // 状态
+      statusOptions: statusOptions,
+      ShowDataTableColumns: ShowDataTableColumns,
+      order_type_options: order_type_options,
+      cost_detailArr: [],
+
+      loading: false,
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      wsm_code: [],
+      wsm_supplierNo: [],
+      parmValue: {
+        bk_code: "", // 备库编码
+        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: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: columns,
+    };
+  },
+  mounted() {
+   
+    this.searchList();
+  },
+
+  methods: {
+    getRouter(toRouter, queryId) {
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select;
+        this.parmValue.sselect = this.sselect;
+        this.parmValue.input = this.input;
+
+        //
+        let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+
+        this.routeGoto(toRouter, model);
+      } else {
+        this.$message.warning("暂未找到相关流程！");
+      }
+    },
+    //选中触发函数
+    selection_change(e) {
+      const { list } = e;
+      //选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
+    },
+    //提交
+    async submit() {
+      if (this.changeList.length <= 0) {
+        this.$message.warning("请选择有效数据");
+        return;
+      }
+
+      if (this.changeList.length != 1) {
+        this.$message.warning("只能同时提交一条选中数据");
+        return;
+      }
+
+      let model = this.changeList[0];
+
+        //提交成功，接口返回数据时，将选中的一行中的采购单编号赋值给页面上的input
+        this.ruleForm.name = model.cgdNo;
+        
+        //处理成功后，关闭弹窗，渲染页面层数据
+        this.centerDialogVisible = false;
+
+        this.sitem = model;
+       
+    },
+
+    async statusConfirm() {
+      if (this.changeList.length <= 0) {
+        this.$message.warning("至少选择一条采购单数据！");
+        return;
+      }
+      let isok = true,
+        list = [];
+      this.changeList.forEach((e) => {
+        if (e.status !== "0") {
+          isok = false;
+        }
+        list.push(e.cgdNo);
+      });
+      if (!isok) {
+        this.$message.warning("只能选择待与供应商确认的采购单！");
+        return;
+      }
+      await this.$confirm(`确定批量确认？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          let model = {
+            cgdNo: list,
+            status: "0",
+          };
+          const res = await asyncRequest.status(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "提交成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    restSearch() {
+      this.sselect = "创建时间";
+      this.select = "1";
+      this.input = "";
+      this.wsm_code = [];
+      this.wsm_supplierNo = [];
+      this.timeOBJ = {
+        start: "", //起始时间
+        end: "", // 结束时间
+      };
+      this.parmValue = {
+        bk_code: "", // 备库编码
+        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 supplierChange(e) {
+      if (e && e.id) {
+        //入库公司
+        // localStorage.setItem("wsm_supplierNo",e.label)
+        // this.supplierName = localStorage.getItem("rkNm")
+        this.parmValue.wsm_supplierNo = e.code;
+        this.wsm_supplierNo = [e.code];
+      } else {
+        //入库公司
+        // localStorage.setItem("wsm_supplierNo","")
+        this.parmValue.wsm_supplierNo = "";
+        this.wsm_supplierNo = [];
+      }
+      this.parmValue.wsm_code = "";
+      this.wsm_code = [];
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
+    },
+    async stockChange(e) {
+      if (e && e.id) {
+        //入库仓库
+        // localStorage.setItem("wsm_code",e.label)
+        this.parmValue.wsm_code = e.code;
+        this.wsm_code = [e.code];
+      } else {
+        //入库仓库
+        // localStorage.setItem("wsm_code","")
+
+        this.parmValue.wsm_code = "";
+        this.wsm_code = [];
+      }
+
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
+    },
+    async searchList() {
+      if (
+        (this.timeOBJ.start !== "" && this.timeOBJ.end === "") ||
+        (this.timeOBJ.start === "" && this.timeOBJ.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+
+      this.loading = true;
+      this.parmValue.cgdNo = this.select === "1" ? this.input : ""; // 采购单编码
+      this.parmValue.wsm_in_code = this.select === "2" ? this.input : ""; // 入库单号
+      this.parmValue.bk_code = this.select === "3" ? this.input : ""; // 备库编码
+      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.wsm_supplierNo = [];
+      const res = await asyncRequest.list(this.parmValue);
+      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;
+    },
+    // 时间
+    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>
+/deep/ .title {
+  width: 500px;
+  display: block;
+  margin-top: 40px;
+}
+/deep/ .demo-ruleForm{
+  width: 80%;
+  min-width: 800px;
+  padding-left: 100px;
+  box-sizing: border-box;
+}
+.con{
+  width: 100%;
+  height: 60vh;
+  background: #fff;
+  // margin-bottom: 40px;
+}
+</style>

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-error-model.vue

@@ -285,6 +285,9 @@ export default {
             return;
           }
           this.showModelThis = false;
+
+
+          console.log("111111111111111111",item)
           this.$emit("refresh", item);
         } else {
           console.log("error submit!!");

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-record-form.vue

@@ -235,7 +235,7 @@ export default {
         if (index === -1) {
           this.tableForm.error_list.push(e);
         } else {
-          this.tableForm.error_list[index] = e;
+           this.$set(this.tableForm.error_list, index, e);
         }
       }
     },

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -347,7 +347,7 @@ export default {
         this.loading = false;
         if (res && res.code === 0) {
           this.$notify.success({
-            title: "反馈物流费用成功！",
+            title: "地址导入成功！",
             message: "",
           });
           this.showModelThis = false;