Merge branch 'sit'

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

@@ -9,9 +9,15 @@ export default {
     // 分页查询
     list: (data, params) => http(api + "brandlist", data, "post", params),
     // 更新
-    update: (data, params) => http(api + "brandedit", data, "post", params),
+    update: (data, params) => http(api + "confirmimportdata", data, "post", params),
     // 修改状态
     status: (data, params) => http(api + 'brandstatus', data, 'post', params),
     // 详情
     detail: (data, params) => http(api + "orderimportinfo", data, "post", params),
+    // 线上商品详情
+    good_detail: (data, params) => http(api + "getonlinegoodinfo", data, "post", params),
+    // 获取销售渠道备选数据
+    sourceList: (data, params) => http(api + "getsourcedata", data, "post", params),
+    //验证售价
+    salegetprice: (data, params) => http(api + "salegetprice", data, "post", params),
 };

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

@@ -1,4 +1,4 @@
-// 物业管理员
+// c端订单录入/订单列表
 import http from "@/apis/axios";
 const api = "admin/";
 export default {
@@ -14,4 +14,7 @@ export default {
     status: (data, params) => http(api + 'brandstatus', data, 'post', params),
     // 详情
     detail: (data, params) => http(api + "orderimportinfo", data, "post", params),
+    // 提交导入数据
+    orderimportlist: (data, params) => http(api + "orderimportlist", data, "post", params),
+    relationstockbatch: (data, params) => http(api + "relationstockbatch", data, "post", params),
 };

src/views/goodStore/dealGoodsPool/columns.js

@@ -36,6 +36,11 @@ const options7 = [
   { id: "1", name: "是" },
 ]
 const listCol = [
+  {
+  type: "selection",
+    fixed: "left",
+    _noset_: true
+  },
   {
     prop: "spuCode",
     label: "编号",

src/views/goodStore/dealGoodsPool/index.vue

@@ -20,6 +20,7 @@
         parmValue.page = 1;
         searchList();
       "
+      @selection="selection_change"
     >
       <template #table-header="{}">
         <div style="width: 100%">
@@ -52,7 +53,24 @@
                 placeholder="商品名称"
               ></el-input>
             </el-col>
-
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 110px; padding: 0 0 0 10px"
+             
+            >
+              <!-- v-if="powers.some((item) => item == '055')" -->
+              <el-button
+                :size="searchSize"
+                type="warning"
+                style="float: right"
+                @click="add_online"
+                 
+              >
+                <i class="el-icon-circle-plus-outline"></i>
+                <span>商品上线</span>
+              </el-button>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -159,6 +177,15 @@
       :iscgd="false"
       @cancel="visible = false"
     />
+
+    <el-dialog
+        title="弹窗"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        center
+      >
+        <span>暂无</span>
+      </el-dialog>
   </div>
 </template>
 <script>
@@ -195,6 +222,10 @@ export default {
       visible: false,
       select: "1",
       sinput: "",
+      //弹窗
+      centerDialogVisible:false,
+      //选中数组
+      changeList:[],
       statusList: [
         {
           code: "0",
@@ -253,6 +284,17 @@ export default {
     this.searchList();
   },
   methods: {
+    //点击商品上线
+    add_online(){
+      this.centerDialogVisible = true;
+    },
+    //选中触发函数
+    selection_change(e) {
+      console.log(e);
+      const { list } = e;
+      //选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
+    },
     show_view(keyRow) {
       this.row = keyRow;
       this.row.dtitle = "咨询成交商品详情";
@@ -400,6 +442,7 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
+        console.log("11111111",this.tableData)
         this.tableData.forEach((a) => {
           a.cat_name = "";
           let list = a.cat_info || [];
@@ -407,6 +450,7 @@ export default {
             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();

src/views/orderEntry/orderConfirm/columns.js

@@ -0,0 +1,289 @@
+import { isnumber, isMobile } from "@/utils/validate";
+const validatemobile = (rule, value, callback) => {
+  if (value === "") {
+    callback(new Error("收货电话不能为空！"));
+  } else {
+    if (!isMobile(value)) {
+      callback(new Error("收货电话格式不正确！"));
+    } else {
+      callback();
+    }
+  }
+};
+const validate_num = (rule, value, callback) => {
+  const { required } = rule;
+  if (required && value === "") {
+    callback(new Error("单价不能为空！"));
+  } else {
+    callback();
+  }
+};
+const validate_num_0 = (rule, value, callback) => {
+  const { required } = rule;
+  if (required && value === "") {
+    callback(new Error("数量不能为空！"));
+  } else if (required && value === "0") {
+    callback(new Error("数量不能为零！"));
+  } else {
+    callback();
+  }
+};
+
+const options = [
+  {
+    value: "1",
+    label: "卡券支付",
+  },
+  {
+    value: "2",
+    label: "现金支付",
+  },
+  {
+    value: "3",
+    label: "混合支付",
+  },
+]
+const ruleForm = {
+  id: "",
+  platform_code: "", //平台订单号
+  po_code: "", //其他单号
+  platform_time: "", //平台下单时间
+  plat_code: "", //平台商品编号
+  sale_source: "", //销售渠道
+  mode: "", //收费模式
+  contactor: "", ///收货人
+  mobile: "", //联系电话
+  price: "", //单价
+  num: "", //数量
+  before_discount_all_price: "", //优惠前总金额
+  activity_name: "", //优惠活动名称
+
+  order_remark: "", //订单备注
+
+  addr: "", //联系地址
+  addr_code: [], //省市区
+}
+const rules = {
+  contactor: [
+    {
+      required: true,
+      trigger: "blur",
+      message: "联系人不能为空",
+    },
+  ],
+  mobile: [
+    {
+      required: true,
+      validator: validatemobile,
+      trigger: "blur",
+    },
+  ],
+
+  addr_code: [
+    {
+      type: "array",
+      required: true,
+      message: "收货省市区不能为空",
+      trigger: "change",
+    },
+  ],
+  addr: [
+    {
+      required: true,
+      message: "详细地址不能为空",
+      trigger: "blur",
+    },
+  ],
+  num: [
+    {
+      required: true,
+      validator: validate_num_0,
+      trigger: "blur",
+    },
+  ],
+  price: [
+    {
+      required: true,
+      validator: validate_num,
+      trigger: "blur",
+    },
+  ],
+}
+//是否定制
+const options1 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+//专属类型
+const options2 = [
+  { id: "0", name: "非泰康" },
+  { id: "1", name: "泰康" },
+]
+//销售权限
+const options3 = [
+  { id: "0", name: "无销售权限" },
+  { id: "1", name: "有销售权限" },
+]
+
+//是否库存品
+const options4 = [
+  { id: "0", name: "非库存品" },
+  { id: "1", name: "库存品" },
+]
+//是否启用实时金价
+const options5 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+//供货区域
+const options6 = [
+  { id: "1", name: "全国" },
+  { id: "2", name: "全国除偏远" },
+]
+//是否启用阶梯
+const options7 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+const options8 = [
+  // { id: "0", name: "待提交" },
+  { id: "1", name: "待完善成本" },
+  { id: "2", name: "待产品审核" },
+  { id: "3", name: "待财务定价" },
+  { id: "4", name: "待财务审核定价" },
+  { id: "5", name: "待上线" },
+  { id: "6", name: "上线成功" },
+  { id: "7", name: "审核失败" },
+  { id: "8", name: "已下线" },
+]
+
+const options9 = [
+  { id: "0", name: "现结" },
+  { id: "1", name: "月清" },
+  { id: "2", name: "双月清" },
+]
+const onlineColumns = [
+  {
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+    span: 24,
+  },
+
+  // {
+  //   prop: "speclist",
+  //   label: "规格",
+  //   _slot_: "speclist",
+  // },
+  // {
+  //   prop: "supplierName",
+  //   label: "供应商名称",
+  // },
+
+  // {
+  //   prop: "good_img",
+  //   _slot_: "good_img",
+  //   label: "商品主图",
+  // },
+
+  // {
+  //   prop: "good_info_img",
+  //   _slot_: "good_info_img",
+  //   label: "详情图",
+  // },
+  {
+    prop: "company",
+    label: "业务企业名称",
+    _slot_: "company",
+    span:24
+  },
+  // {
+  //   prop: "online_reason",
+  //   label: "上线原因",
+  // },
+
+
+
+  // {
+  //   prop: "creater",
+  //   label: "申请人",
+  //   span: 6,
+  // },
+  {
+    prop: "platform_name",
+    label: "所属平台",
+    span:24
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    span:24
+  },
+  // {
+  //   prop: "platform_code_en",
+  //   label: "平台商品编码",
+  //   span: 6,
+  // },
+  // {
+  //   prop: "online_time",
+  //   label: "上线时间",
+  //   span: 8,
+  // },
+  {
+    prop: "cat_info",
+    label: "分类",
+    _slot_:'cat_info',
+    span:24
+  },
+
+
+  {
+    prop: "unit",
+    label: "单位",
+    span:10
+  },
+
+
+  // {
+  //   prop: "is_auth",
+  //   label: "供应商权限",
+  //   _slot_: "is_auth",
+  //   span: 6,
+  // },
+
+  {
+    prop: "is_stock",
+    label: "是否库存品",
+    _slot_: "is_stock",
+    span:14
+  },
+  {
+    prop: "tax",
+    label: "税点",
+    append: '%',
+    span:10
+  },
+
+
+  {
+    prop: "exclusive",
+    label: "专属类型",
+    _slot_: "exclusive",
+    span:14
+  },
+]
+export {
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  options9,
+  onlineColumns,
+  options,
+  ruleForm,
+  rules,
+}

src/views/orderEntry/orderConfirm/index.vue

@@ -4,66 +4,613 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <div
-        class="detail-page-title"
-        v-if="status === '1' && powers.some((item) => item == '082')"
+      <el-form
+        ref="ruleForm"
+        :model="ruleForm"
+        status-icon
+        :size="'mini'"
+        :rules="rulesThis"
+        label-width="0px"
       >
-        <span>采购单编号：</span><span>{{ queryId }} </span>
-        <tolerance
-          :newTime="newTime"
-          v-if="newTime !== ''"
-          :sitem="sitem"
-          :showBtn="status === '1' && powers.some((item) => item == '082')"
-        />
-
-       
-      </div> -->
-      <el-tabs v-model="activeTabs">
-        <el-tab-pane label="业务详情" name="1">
-          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="平台订单信息" name="1">
+        <div class="tab-row">
+          <div class="tab-item-label">
+            <label style="color: transparent">*</label>字段
+          </div>
+          <div class="tab-item-main">
+            <el-row class="tab-title">
+              <el-col :span="4">文件导入数据</el-col>
+              <el-col :span="9">系统解析数据</el-col>
+              <el-col :span="11">确认后的数据</el-col>
+            </el-row>
+          </div>
+        </div>
+
+        <div
+          v-if="
+            importSitem &&
+            importSitem.platform_code &&
+            confirmSitem &&
+            confirmSitem.platform_code
+          "
+        >
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <div><label style="color: red">*</label>平台订单号</div>
+              <div><label style="color: transparent">*</label>其他单号</div>
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">
+                  <div>{{ importSitem.platform_code }}</div>
+                  <div>{{ importSitem.po_code }}</div>
+                </el-col>
+                <el-col :span="9">
+                  <div>{{ confirmSitem.platform_code }}</div>
+                  <div>{{ confirmSitem.po_code }}</div>
+                </el-col>
+                <el-col :span="11" class="nop">
+                  <el-row>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="platform_code">
+                        <el-input
+                          v-model="ruleForm.platform_code"
+                          maxlength="100"
+                          :disabled="isDetail"
+                          placeholder="平台订单号"
+                        /> </el-form-item
+                    ></el-col>
+
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="po_code">
+                        <el-input
+                          v-model="ruleForm.po_code"
+                          maxlength="100"
+                          :disabled="isDetail"
+                          placeholder="其他单号"
+                        />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <div><label style="color: red">*</label>平台订单下单时间</div>
+              <div><label style="color: red">*</label>平台商品编号</div>
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">
+                  <div>{{ importSitem.platform_time }}</div>
+                  <div>{{ importSitem.plat_code }}</div>
+                </el-col>
+                <el-col :span="9"
+                  ><div>{{ confirmSitem.platform_time }}</div>
+                  <div>{{ confirmSitem.plat_code }}</div>
+                  <div v-if="conGoodData && conGoodData.good_thumb_img">
+                    <show-data-table
+                      :sitem="conGoodData"
+                      :columns="onlineColumns"
+                      :border="true"
+                    >
+                      <template slot="good_name">
+                        <img
+                          v-viewer
+                          style="width: 23px; height: 23px; margin: 0 5px 0 0"
+                          class="fl hover"
+                          v-if="conGoodData.good_thumb_img"
+                          :src="conGoodData.good_thumb_img"
+                          alt=""
+                        />
+                        <span>{{ conGoodData.good_name }}</span>
+                        <span
+                          v-for="(si, i) in conGoodData.speclist"
+                          :key="si.spec_id + i"
+                        >
+                          <span v-if="i !== 0">-</span>
+                          <span v-else>_</span>
+                          <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+                        </span>
+                        <el-popover placement="top" width="300" trigger="hover">
+                          <ul>
+                            <li>
+                              <span>SKU编号：</span
+                              ><span>{{ conGoodData.skuCode }}</span>
+                            </li>
+                            <li
+                              v-if="
+                                newTime !== '' &&
+                                private_field &&
+                                private_field.length > 0 &&
+                                private_field.some((item) => item == '1')
+                              "
+                            >
+                              <span>SPU编号：</span
+                              ><span>{{ conGoodData.spuCode }}</span>
+                            </li>
+                            <li>
+                              <span>平台商品编码：</span
+                              ><span>{{ conGoodData.platform_code_en }}</span>
+                            </li>
+                          </ul>
+                          <i
+                            class="el-icon-warning-outline fr"
+                            slot="reference"
+                          ></i>
+                        </el-popover>
+                      </template>
+
+                      <template slot="company">
+                        <span>{{ conGoodData.company }}</span>
+                        <el-popover placement="top" width="300" trigger="hover">
+                          <ul>
+                            <li>
+                              <span>业务企业编号：</span
+                              ><span>{{ conGoodData.companyNo }}</span>
+                            </li>
+                          </ul>
+                          <i
+                            class="el-icon-warning-outline fr"
+                            slot="reference"
+                          ></i>
+                        </el-popover>
+                      </template>
+
+                      <template slot="cat_info">
+                        <span
+                          v-for="(si, sii) in conGoodData.cat_info"
+                          :key="si + sii"
+                          >{{ sii === 0 ? "" : "_" }}{{ si.name }}</span
+                        >
+                      </template>
+                      <template slot="exclusive">
+                        <span
+                          v-for="(si, sii) in conGoodData.exclusive"
+                          :key="si.id"
+                        >
+                          <span v-if="sii !== 0">/</span>
+                          <span>{{ si.name }}</span>
+                        </span>
+                      </template>
+
+                      <template slot="is_stock">
+                        <el-tag
+                          :size="'mini'"
+                          v-text="
+                            (
+                              options4.find(
+                                (item) => item.id == conGoodData.is_stock
+                              ) || {}
+                            ).name || '--'
+                          "
+                        />
+                      </template>
+                    </show-data-table>
+                  </div>
+                </el-col>
+                <el-col :span="11" class="nop">
+                  <el-row>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="platform_time">
+                        <el-date-picker
+                          type="datetime"
+                          placeholder="平台订单下单时间"
+                          v-model="ruleForm.platform_time"
+                          style="width: 100%"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          :picker-options="pickerOptions"
+                          @change="selectTime"
+                        >
+                        </el-date-picker> </el-form-item
+                    ></el-col>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="plat_code">
+                        <el-input
+                          v-model="ruleForm.plat_code"
+                          maxlength="100"
+                          :disabled="isDetail"
+                          placeholder="平台商品编号"
+                      /></el-form-item>
+                    </el-col>
+                    <el-col
+                      :span="24"
+                      v-if="subGoodData && subGoodData.good_thumb_img"
+                    >
+                      <show-data-table
+                        :sitem="subGoodData"
+                        :columns="onlineColumns"
+                        :border="true"
+                      >
+                        <template slot="good_name">
+                          <img
+                            v-viewer
+                            style="width: 23px; height: 23px; margin: 0 5px 0 0"
+                            class="fl"
+                            v-if="subGoodData.good_thumb_img"
+                            :src="subGoodData.good_thumb_img"
+                            alt=""
+                          />
+                          <span>{{ subGoodData.good_name }}</span>
+                          <span
+                            v-for="(si, i) in subGoodData.speclist"
+                            :key="si.spec_id + i"
+                          >
+                            <span v-if="i !== 0">-</span>
+                            <span v-else>_</span>
+                            <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+                          </span>
+                          <el-popover
+                            placement="top"
+                            width="300"
+                            trigger="hover"
+                          >
+                            <ul>
+                              <li>
+                                <span>SKU编号：</span
+                                ><span>{{ subGoodData.skuCode }}</span>
+                              </li>
+                              <li
+                                v-if="
+                                  newTime !== '' &&
+                                  private_field &&
+                                  private_field.length > 0 &&
+                                  private_field.some((item) => item == '1')
+                                "
+                              >
+                                <span>SPU编号：</span
+                                ><span>{{ subGoodData.spuCode }}</span>
+                              </li>
+                              <li>
+                                <span>平台商品编码：</span
+                                ><span>{{ subGoodData.platform_code_en }}</span>
+                              </li>
+                            </ul>
+                            <i
+                              class="el-icon-warning-outline fr"
+                              slot="reference"
+                            ></i>
+                          </el-popover>
+                        </template>
+
+                        <template slot="company">
+                          <span>{{ subGoodData.company }}</span>
+                          <el-popover
+                            placement="top"
+                            width="300"
+                            trigger="hover"
+                          >
+                            <ul>
+                              <li>
+                                <span>业务企业编号：</span
+                                ><span>{{ subGoodData.companyNo }}</span>
+                              </li>
+                            </ul>
+                            <i
+                              class="el-icon-warning-outline fr"
+                              slot="reference"
+                            ></i>
+                          </el-popover>
+                        </template>
+                        <template slot="cat_info">
+                          <span
+                            v-for="(si, sii) in conGoodData.cat_info"
+                            :key="si + sii"
+                            >{{ sii === 0 ? "" : "_" }}{{ si.name }}</span
+                          >
+                        </template>
+                        <template slot="exclusive">
+                          <span
+                            v-for="(si, sii) in subGoodData.exclusive"
+                            :key="si.id"
+                          >
+                            <span v-if="sii !== 0">/</span>
+                            <span>{{ si.name }}</span>
+                          </span>
+                        </template>
+
+                        <template slot="is_stock">
+                          <el-tag
+                            :size="'mini'"
+                            v-text="
+                              (
+                                options4.find(
+                                  (item) => item.id == subGoodData.is_stock
+                                ) || {}
+                              ).name || '--'
+                            "
+                          />
+                        </template>
+                      </show-data-table>
+                    </el-col>
+                  </el-row>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <div><label style="color: red">*</label>收费模式</div>
+              <div><label style="color: red">*</label>销售渠道</div>
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">
+                  <div>{{ importSitem.mode }}</div>
+                  <div>{{ importSitem.sale_source }}</div>
+                </el-col>
+                <el-col :span="9">
+                  <div>{{ confirmSitem.mode }}</div>
+                  <div>{{ confirmSitem.sale_source }}</div></el-col
+                >
+                <el-col :span="11" class="nop">
+                  <el-row>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="mode">
+                        <el-select
+                          v-model="ruleForm.mode"
+                          style="width: 100%"
+                          placeholder="收费模式"
+                        >
+                          <el-option
+                            v-for="item in options"
+                            :key="item.label"
+                            :label="item.label"
+                            :value="item.label"
+                          >
+                          </el-option> </el-select
+                      ></el-form-item>
+                    </el-col>
+
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="sale_source">
+                        <el-select
+                          v-model="ruleForm.sale_source"
+                          style="width: 100%"
+                          placeholder="销售渠道"
+                        >
+                          <el-option
+                            v-for="(item, i) in coptions"
+                            :key="item.source + i"
+                            :label="item.source"
+                            :value="item.source"
+                          >
+                          </el-option> </el-select></el-form-item></el-col
+                  ></el-row>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <div><label style="color: red">*</label>收货人</div>
+              <div><label style="color: red">*</label>收货电话</div>
+            </div>
+            <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="3">字段</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
+                <el-col :span="4">
+                  <div>
+                    {{ importSitem.contactor }}
+                  </div>
+                  <div>
+                    {{ importSitem.mobile }}
+                  </div>
+                </el-col>
+                <el-col :span="9">
+                  <div>
+                    {{ confirmSitem.contactor }}
+                  </div>
+                  <div>
+                    {{ confirmSitem.mobile }}
+                  </div></el-col
+                >
+                <el-col :span="11" class="nop">
+                  <el-row>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="contactor">
+                        <el-input
+                          v-model="ruleForm.contactor"
+                          maxlength="100"
+                          :disabled="isDetail"
+                          placeholder="收货人"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="mobile">
+                        <el-input
+                          v-model="ruleForm.mobile"
+                          maxlength="100"
+                          :disabled="isDetail"
+                          placeholder="收货电话"
+                        />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-col>
               </el-row>
-                <el-row class="tab-title">
-                <el-col :span="3">平台订单号</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
+            </div>
+          </div>
+
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <div><label style="color: red">*</label>省市区</div>
+              <div><label style="color: red">*</label>详细地址</div>
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">
+                  <div>{{ importSitem.addr }}</div>
+                  <div>{{ importSitem.addr }}</div></el-col
+                >
+                <el-col :span="9">
+                  <div>{{ confirmSitem.addr }}</div>
+                  <div>{{ confirmSitem.addr }}</div>
+                </el-col>
+                <el-col :span="11" class="nop">
+                  <el-row>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="addr_code">
+                        <select-area
+                          :value="ruleForm.addr_code"
+                          :size="'mini'"
+                          placeholder="收货省市区"
+                          @selectChange="select_area_change($event)"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="addr">
+                        <el-input
+                          v-model="ruleForm.addr"
+                          maxlength="100"
+                          :disabled="isDetail"
+                          placeholder="详细地址"
+                        />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <label style="color: red">*</label>订单备注
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">{{ importSitem.order_remark }}</el-col>
+                <el-col :span="9">{{ confirmSitem.order_remark }}</el-col>
+                <el-col :span="11">
+                  <el-form-item prop="order_remark">
+                    <el-input
+                      v-model="ruleForm.order_remark"
+                      maxlength="100"
+                      :disabled="isDetail"
+                      placeholder="订单备注" /></el-form-item
+                ></el-col>
               </el-row>
-                <el-row class="tab-title">
-                <el-col :span="3">平台订单下单时间</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
+            </div>
+          </div>
+
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <div><label style="color: red">*</label>数量</div>
+              <div><label style="color: red">*</label>单价</div>
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">
+                  <div>{{ importSitem.num }}</div>
+                  <div>{{ importSitem.price }}</div>
+                </el-col>
+                <el-col :span="9">
+                  <div>{{ confirmSitem.num }}</div>
+                  <div>{{ confirmSitem.price }}</div>
+                </el-col>
+                <el-col :span="11" class="nop">
+                  <el-row>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="num">
+                        <digital-input
+                          :values="ruleForm.num"
+                          :placeholder="'数量'"
+                          :min="0"
+                          :disabled="false"
+                          :max="100000000000"
+                          :position="'right'"
+                          :precision="0"
+                          :size="'mini'"
+                          :controls="false"
+                          :append="''"
+                          @reschange="number_change($event, 'num')"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" class="border">
+                      <el-form-item prop="price">
+                        <digital-input
+                          :values="ruleForm.price"
+                          :placeholder="'单价'"
+                          :min="price_min"
+                          :disabled="false"
+                          :max="100000000000"
+                          :position="'right'"
+                          :precision="2"
+                          :size="'mini'"
+                          :controls="false"
+                          :append="'元'"
+                          @reschange="number_change($event, 'price')"
+                        />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-col>
               </el-row>
-                <el-row class="tab-title">
-                <el-col :span="3">平台商品编号</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
+            </div>
+          </div>
+
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <label style="color: transparent">*</label>活动名称
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">{{ importSitem.activity_name }}</el-col>
+                <el-col :span="9">{{ confirmSitem.activity_name }}</el-col>
+                <el-col :span="11">
+                  <el-form-item prop="activity_name">
+                    <el-input
+                      v-model="ruleForm.activity_name"
+                      maxlength="100"
+                      :disabled="isDetail"
+                      placeholder="活动名称"
+                    /> </el-form-item
+                ></el-col>
               </el-row>
-                <el-row class="tab-title">
-                <el-col :span="3">销售渠道</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
+            </div>
+          </div>
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <label style="color: transparent">*</label>订单总金额
+            </div>
+            <div class="tab-item-main">
+              <el-row class="tab-title">
+                <el-col :span="4">{{
+                  importSitem.before_discount_all_price
+                }}</el-col>
+                <el-col :span="9">{{
+                  confirmSitem.before_discount_all_price
+                }}</el-col>
+                <el-col :span="11">
+                  {{ ruleForm.before_discount_all_price }}</el-col
+                >
               </el-row>
-            </el-collapse-item>
-          </el-collapse>
-        </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2">
-          <process-time-line
-            v-if="newTime !== ''"
-            :newTime="newTime"
-            :type="'CGD'"
-            :orderCode="queryId"
-          />
-        </el-tab-pane>
-      </el-tabs>
+            </div>
+          </div>
+          <div class="tab-row">
+            <div class="tab-item-label">
+              <label style="color: transparent">*</label>
+            </div>
+            <div class="tab-item-main tr">
+              <el-button
+                v-if="!isDetail"
+                type="primary"
+                @click="submitForm"
+                :size="'mini'"
+                >保 存
+              </el-button>
+              <el-button @click="showModelThis = false" :size="'mini'">{{
+                isDetail ? "关 闭" : "取 消"
+              }}</el-button>
+            </div>
+          </div>
+        </div>
+      </el-form>
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -74,7 +621,21 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/orderEntry/orderConfirm";
-
+import {
+  options,
+  ruleForm,
+  rules,
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  options9,
+  onlineColumns,
+} from "./columns";
 export default {
   name: "orderConfirm",
   mixins: [mixinPage, resToken],
@@ -98,86 +659,340 @@ export default {
       activeTabs: "1",
       isMetal: false,
       finishStatus: "finish",
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > new Date().valueOf();
+        },
+      },
       activeNames: ["0", "1", "2", "3", "4", "5", "10"],
-      sitem: null,
+      importSitem: null,
+      confirmSitem: null,
+      price_min: "0",
+      subSitem: null,
+      conGoodData: null,
+      subGoodData: null,
       status: "",
       newTime: "",
       loading: false,
       queryId: "",
-      ReturnAddModel: false, //采购单退货弹窗
+      rulesThis: {},
+      coptions: [],
+      options,
+      ruleForm: {},
+      rules,
+      options1,
+      options2,
+      options3,
+      options4,
+      options5,
+      options6,
+      options7,
+      options8,
+      options9,
+      onlineColumns,
+      priceLoding: false,
     };
   },
   mounted() {
     this.queryId = this.$route.query.id;
-    this.initData();
+    this.initForm();
   },
   methods: {
-   
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
 
-    async examForm(e) {
-      if (!this.loading) {
-        let type = e.state === "1" ? "2" : "0";
-        await this.setStatus(type, "提交入库方审核", e.remark);
-      }
+    async initForm() {
+      this.loading = true;
+      this.rulesThis = this.rules;
+      await this.resetForm();
+      await this.initData();
+      this.loading = false;
     },
+
+    async againForm(sitem) {
+      const {
+        platform_code,
+        po_code,
+        platform_time,
+        plat_code,
+        sale_source,
+        mode,
+        contactor,
+        mobile,
+        price,
+        num,
+        before_discount_all_price,
+        activity_name,
+        order_remark,
+        addr,
+        addr_code,
+      } = sitem;
+      this.ruleForm = {
+        id: this.queryId || "",
+        platform_code: platform_code || "", //平台订单号
+        po_code: po_code || "", //其他单号
+        platform_time: platform_time || "", //平台下单时间
+        plat_code: plat_code || "", //平台商品编号
+        sale_source: sale_source || "", //销售渠道
+        mode: mode || "", //收费模式
+        contactor: contactor || "", ///收货人
+        mobile: mobile || "", //联系电话
+        price: price || "", //单价
+        num: num || "", //数量
+        before_discount_all_price: before_discount_all_price || "", //优惠前总金额
+        activity_name: activity_name || "", //优惠活动名称
+        order_remark: order_remark || "", //订单备注
+        addr: addr || "", //联系地址
+        addr_code: addr_code && addr_code.length > 0 ? addr_code : [], //省市区
+      };
+      this.ruleForm.before_discount_all_price = this.accMul(
+        this.ruleForm.num,
+        this.ruleForm.price
+      );
+    },
+
     async initData() {
       this.loading = true;
-      const res = await asyncRequest.detail({ id: this.queryId });
-      if (res && res.code === 0 && res.data) {
-        this.sitem = res.data;
-        const { status, can, cgdNo } = this.sitem;
+      const { code, data, message } = await asyncRequest.detail({
+        id: this.queryId,
+      });
+      if (code === 0) {
+        const { status, import: simport, confirm, user_update } = data;
+        this.importSitem = simport ? JSON.parse(JSON.stringify(simport)) : null;
+        this.confirmSitem = confirm
+          ? JSON.parse(JSON.stringify(confirm))
+          : null;
+        this.subSitem = user_update
+          ? JSON.parse(JSON.stringify(user_update))
+          : null;
         this.status = status;
-        if (can && can.length > 0) {
-          this.sitem.class_cat = "";
-          can.forEach((x, i) => {
-            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
-          });
+        // console.log(this.status);
+        if (this.confirmSitem && this.confirmSitem.plat_code) {
+          await this.onlineData(1, this.confirmSitem.plat_code);
+          if (
+            !(this.status === "3" || this.status === "4" || this.status === "5")
+          ) {
+            await this.againForm(this.confirmSitem);
+          }
+        }
+        if (this.subSitem && this.subSitem.plat_code) {
+          await this.onlineData(2, this.subSitem.plat_code);
+          if (
+            this.status === "3" ||
+            this.status === "4" ||
+            this.status === "5"
+          ) {
+            await this.againForm(this.subSitem);
+          }
         }
+
         this.getNewTime();
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(message);
       }
       this.loading = false;
     },
-    async statusConfirm() {
-      await this.$confirm(`确定已与供应商确认？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          let model = {
-            cgdNo: this.sitem.cgdNo,
-            status: "1",
-          };
-          const res = await asyncRequest.status(model);
+    async onlineData(type, good_code) {
+      this.loading = true;
+      const { code, data, message } = await asyncRequest.good_detail({
+        plat_code: good_code,
+      });
+      if (code === 0) {
+        if (type === 1) {
+          this.conGoodData = data;
+        } else {
+          this.subGoodData = data;
+          const { platform_code } = this.subGoodData;
+          if (platform_code) {
+            await this.get_source(platform_code);
+          }
+        }
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+      this.loading = false;
+    },
+
+    async get_source(platform_code) {
+      this.coptions = [];
+      const { code, data, message } = await asyncRequest.sourceList({
+        platform_id: platform_code,
+      });
+      if (code === 0) {
+        this.coptions = data;
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    //省市区选择
+    async select_area_change(e) {
+      this.ruleForm.addr_code = e;
+      this.$refs.ruleForm.validateField("addr_code");
+    },
+    async number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+      if (key === "num") {
+        await this.get_new_price();
+      }
+      this.ruleForm.before_discount_all_price = this.accMul(
+        this.ruleForm.num,
+        this.ruleForm.price
+      );
+    },
+    accMul(arg1, arg2) {
+      var m = 0,
+        s1 = arg1.toString(),
+        s2 = arg2.toString();
+
+      try {
+        m += s1.split(".")[1].length;
+      } catch (e) {}
+
+      try {
+        m += s2.split(".")[1].length;
+      } catch (e) {}
+
+      return (
+        (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
+        Math.pow(10, m)
+      );
+    },
+    async get_new_price() {
+      const { num, activity_name } = this.ruleForm;
+
+      if (num * 1 === 0) {
+        this.price_min = "0";
+        this.ruleForm.price = "0";
+        return;
+      } else {
+        const { skuCode: conSkuCode } = this.conGoodData;
+        const { skuCode: subSkuCode } = this.subGoodData;
+
+        let model = {
+          skuCode:
+            this.status === "3" || this.status === "4" || this.status === "5"
+              ? subSkuCode
+              : conSkuCode,
+          sale_num: num,
+          is_activity: activity_name ? "1" : "0",
+          act_code: activity_name ? activity_name : "",
+        };
+        if (!this.priceLoding) {
+          const { isok, price } = await this.set_salegetprice(model);
+          this.price_min = isok ? price : "0";
+          if (!isok) {
+            this.ruleForm.price = "0";
+          } else {
+            if (price * 1 >= this.ruleForm.price * 1)
+              this.ruleForm.price = price;
+          }
+        }
+      }
+    },
+
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = ruleForm;
+        }
+      });
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          const { code, data, message } = await asyncRequest.update(model);
           this.loading = false;
-          if (res && res.code === 0) {
+          if (code === 0) {
             this.$notify.success({
-              title: "提交成功！",
+              title: "提交成功!",
               message: "",
             });
-            await this.initData();
-          } else if (res && res.code >= 100 && res.code <= 104) {
+            this.initForm();
+          } else if (code >= 100 && code <= 104) {
             await this.logout();
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(message);
           }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    async set_salegetprice(model) {
+      this.priceLoding = true;
+      let resModel = {
+        isok: true,
+        price: "0",
+      };
+      // console.log(model);
+      let { code, message, data } = await asyncRequest.salegetprice(model);
+      if (code === 0) {
+        const { sale_price } = data;
+        resModel.price = sale_price + "";
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+        resModel.isok = false;
+      }
+      this.priceLoding = false;
+      return resModel;
     },
   },
 };
 </script>
    <style lang="scss" scoped>
 .orderConfirm {
+  font-size: 13px;
+  color: #909399 !important;
+  line-height: 26px;
+  .tab-row {
+    border-left: 1px solid #ebeef5;
+    border-top: 1px solid #ebeef5;
+    display: flex;
+    align-items: stretch;
+    .tab-item-label {
+      padding: 4px 5px;
+      width: 125px;
+      .red {
+        color: red;
+        padding: 0 5px 0 0;
+      }
+    }
+    .tab-item-main {
+      width: calc(100% - 125px);
+      border-left: 1px solid #ebeef5;
+
+      .tab-title {
+        display: flex;
+        align-items: stretch;
+        .el-col {
+          padding: 3px 5px;
+          border-right: 1px solid #ebeef5;
+          &.nop {
+            padding: 0;
+          }
+          &.border {
+            border: 0;
+          }
+        }
+      }
+    }
+  }
 }
 </style>
    

src/views/orderEntry/orderEnter/columns.js

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

src/views/orderEntry/orderEnter/index.vue

@@ -1,274 +1,282 @@
 <template>
-  <div class="goodsCost pagePadding">
-    <ex-table
-      v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-      :table="table"
-      :data="tableData"
-      :columns="columns"
-      :page="pageInfo"
-      :size="size"
-      @page-curr-change="handlePageChange"
-      @page-size-change="handleSizeChange"
-      @screen-reset="
-        pageInfo.curr = 1;
-        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 10px 80px">
-            <el-col :span="6" style="width: 303px">
-              <period-date-picker
-                :type="1"
-                :width="'135px'"
-                :size="searchSize"
-                :start="parmValue.start"
-                :end="parmValue.end"
-                @timeReturned="handleTime"
-              />
-            </el-col>
-            <el-col :span="4" style="width: 135px">
-              <search-brand
-                :value="brandid"
-                :disabled="false"
-                :size="'mini'"
-                :isDetail="false"
-                :names="''"
-                :placeholder="'商品品牌'"
-                @searchChange="brandidsearchChange"
-              />
-            </el-col>
-            <el-col :span="6" style="width: 310px; padding: 0 0 0 10px">
-              <good-class
-                :value="parmValue.cat_id"
-                @handleChange="goods_class_change"
-                :disabled="false"
-                :size="searchSize"
-                :isDetail="false"
-                :placeholder="'分类'"
-              />
-            </el-col>
-
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
+  <div class="box">
+    <div class="tableBox">
+      <ex-table
+        ref="multipleTable"
+        v-loading="loading"
+        v-if="
+          powers && powers.length > 0 && powers.some((item) => item == '001')
+        "
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @selection="selection_change"
+        ><template #table-header="{}">
+          <div class="searchBox">
+            <el-button
+                
+                    class="btn entry"
+                    @click="entry"
+                    size="mini"
+                    >订单导入</el-button
+                  >
+            <el-form
+              ref="form"
+              :model="parmValue"
+              label-width="80px"
+              size="medium "
+              class="form"
             >
-              <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-row>
+                <el-col :span="5">
+                  <el-form-item
+                    label="销售方"
+                    prop="status"
+                    label-width="100px"
+                  >
+                    <el-select
+                      @change="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                      v-model="parmValue.status"
+                      style="width: 100%"
+                      placeholder="咨询类型"
+                    >
+                      <el-option
+                        v-for="item in statusArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item
+                    label="平台订单号"
+                    prop="platform_code"
+                    label-width="110px"
+                  >
+                    <el-input
+                      v-model="parmValue.platform_code"
+                      @blur="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                      placeholder="平台订单号"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10">
+                  <el-form-item label="平台下单时间" label-width="120px">
+                    <period-date-picker
+                      :start="parmValue.platform_time_start"
+                      :end="parmValue.platform_time_end"
+                      :width="'135px'"
+                      :size="searchSize"
+                      @timeReturned="platformTime"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="3">
+                  <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-search"
+                    class="btn"
+                    @click="selectStock"
+                    >批量关联库存</el-button
+                  >
+                </el-col>
+                <el-col :span="1">
+                  <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-search"
+                    class="btn"
+                    @click="search"
+                    >搜索</el-button
+                  >
+                </el-col>
+              </el-row>
+            </el-form>
+            <el-form
+              ref="form"
+              :model="parmValue"
+              label-width="80px"
+              size="medium "
+              class="form"
             >
-              <el-button type="warning" :size="searchSize" @click="restSearch">
-                重置
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" style="width: 226px">
-              <el-select
-                v-model="parmValue.status"
-                filterable
-                clearable
-                :size="searchSize"
-                placeholder="状态"
-                style="width: 100%"
-                @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              >
-                <el-option
-                  v-for="item in statusList"
-                  :key="'status' + item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4" style="width: 145px; padding: 0 0 0 10px">
-              <el-select
-                v-model="parmValue.isonline"
-                filterable
-                clearable
-                :size="searchSize"
-                placeholder="是否上线"
-                style="width: 100%"
-                @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              >
-                <el-option
-                  v-for="item in isonlineoptions"
-                  :key="'isonline' + item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4" style="width: 420px; padding: 0 0 0 10px">
-              <el-input
-                :size="searchSize"
-                v-model="sinput"
-                :maxlength="40"
-                @blur="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-                placeholder="关键字"
-                ><el-select
-                  v-model="select"
-                  slot="prepend"
-                  style="width: 135px"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                  placeholder="关键字类型"
-                >
-                  <el-option label="商品编号" value="1" />
-                  <el-option label="商品名称" value="2" />
-                  <el-option label="业务企业编号" value="3" />
-                  <el-option label="供应商编号" value="4" /> </el-select
-              ></el-input>
-            </el-col>
+              <el-row justify="space-around">
+                <el-col :span="5">
+                  <el-form-item
+                    label="PO编号"
+                    prop="po_code"
+                    label-width="100px"
+                  >
+                    <el-input
+                      v-model="parmValue.po_code"
+                      @blur="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                      placeholder="PO编号"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item
+                    label="平台商品编号"
+                    prop="plat_code"
+                    label-width="110px"
+                  >
+                    <el-input
+                      v-model="parmValue.plat_code"
+                      @blur="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                      placeholder="平台商品编号"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10">
+                  <el-form-item label="导入时间" label-width="120px">
+                    <period-date-picker
+                      :start="parmValue.addtime_start"
+                      :end="parmValue.addtime_end"
+                      :width="'135px'"
+                      :size="searchSize"
+                      @timeReturned="addtime"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="3">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-download"
+                    class="btn"
+                    size="mini"
+                    ><a href="./static/C端订单导入模板.xlsx"
+                      >下载导入模板</a
+                    ></el-button
+                  >
+                </el-col>
+                <el-col :span="1">
+                  <el-button
+                    icon="el-icon-refresh-right"
+                    class="btn"
+                    @click="reset"
+                    size="mini"
+                    >重置</el-button
+                  >
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((item) => item == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="
+                routeGoto('orderConfirm', {
+                  id: scope.row.id,
+                  type: 'view',
+                })
+              "
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
 
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '003')"
-            >
-              <el-button
-                :size="searchSize"
-                type="success"
-                style="float: right"
-                @click="
-                  routeGoto('goodsCostDetail', { id: 'add', type: 'add' })
-                "
-              >
-                添加
-              </el-button>
-            </el-col>
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 110px; padding: 0 0 0 10px"
-              v-if="powers.some((item) => item == '055')"
-            >
-              <el-button
-                :size="searchSize"
-                type="warning"
-                style="float: right"
-                @click="add_online"
-              >
-                <i class="el-icon-circle-plus-outline"></i>
-                <span>商品上线</span>
-              </el-button>
-            </el-col>
-          </el-row>
-        </div></template
+      <!-- <el-dialog
+        title="当前可用库存"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        center
       >
-
-      <template #good_thumb_img="{ scope }">
-        <div
-          v-if="scope.row.good_thumb_img"
-          style="width: 20px; height: 20px"
-          class="hover"
-          v-viewer
-        >
-          <img
-            :src="scope.row.good_thumb_img"
-            style="display: inline-block; width: 100%; height: 100%"
-            alt=""
-          />
-        </div>
-      </template>
-      <template #status="{ scope }">
-        <el-tag
-          :size="tablebtnSize"
-          :type="
-            (statusList.find((item) => item.code == scope.row.status) || {})
-              .type || '--'
-          "
-          v-text="
-            (statusList.find((item) => item.code == scope.row.status) || {})
-              .name || '--'
-          "
-        ></el-tag>
-      </template>
-      <template #isonline="{ scope }">
-        <el-tag
-          :size="tablebtnSize"
-          :type="scope.row.is_online == '0' ? 'warning' : ''"
-          v-text="
-            (
-              isonlineoptions.find((item) => item.id == scope.row.is_online) ||
-              {}
-            ).name || '--'
-          "
-        ></el-tag>
-      </template>
-
-      <template #operation="{ scope }">
-        <el-tooltip
-          effect="dark"
-          content="详情"
-          placement="top"
-        >
-          <i
-            class="el-icon-view tb-icon"
-            @click="
-              routeGoto('orderConfirm', {
-                id: scope.row.id,
-                type: 'view',
-              })
-            "
-          ></i>
-        </el-tooltip>
-      </template>
-    </ex-table>
-    <no-auth v-else></no-auth>
-    <add-edit
-      :id="''"
-      :sitem="changeList"
-      :show-model="showModel"
-      :is-detail="false"
-      @refresh="showModel = false"
-      @cancel="showModel = false"
-    />
+        <span>等待数据返回</span>
+      </el-dialog> -->
+    </div>
   </div>
 </template>
+
 <script>
+import { listCol } from "./columns";
+import { mapGetters } from "vuex";
 import asyncRequest from "@/apis/service/orderEntry/orderEnter";
 import mixinPage from "@/mixins/elPaginationHandle";
-import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
-import { listCol, options1, statusList } from "./columns";
-// import addEdit from "./components/addEdit";
 export default {
-  name: "goodsCost",
   mixins: [mixinPage, resToken],
-  // components: {
-  //   addEdit,
-  // },
+  data() {
+    return {
+      // centerDialogVisible: false,
+      loading: true,
+      //咨询类型
+      statusArr: [
+        { value: "1", label: "系统验证数据中" },
+        { value: "2", label: "待确认订单信息" },
+        { value: "3", label: "待处理(待扣减库存)" },
+        { value: "4", label: "库存不足" },
+        { value: "5", label: "订单录入成功" },
+      ],
+      parmValue: {
+        status: "1",
+        platform_code: "",
+        // cs3: "",
+        po_code: "",
+        plat_code: "",
+        // cs6: "",
+        platform_time_end: "",
+        platform_time_start: "",
+        addtime_end: "",
+        addtime_start: "",
+        page: 1,
+        size: 15,
+      },
+      changeList: [],
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      tableData: [],
+      columns: listCol,
+    };
+  },
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -284,319 +292,212 @@ export default {
       }
     },
   },
-  data() {
-    return {
-      statusList,
-      isonlineoptions: [
-        { id: "0", name: "未上线" },
-        { id: "1", name: "已上线" },
-      ],
-      showModel: false,
-      options1: options1,
-      loading: false,
-      changeList: [],
-      parmValue: {
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        spucode: "",
-        cat_id: [],
-        brandid: "",
-        good_type: "",
-        companyNo: "",
-        supplierNo: "",
-        isonline: "",
-        // creater: "",
-      },
-      sinput: "",
-      select: "",
-      // 表格 - 数据
-      tableData: [],
-      // 表格 - 参数
-      table: {
-        stripe: true,
-        border: true,
-        _defaultHeader_: ["setcol"],
-      },
-      // 表格 - 分页
-      pageInfo: {
-        size: 15,
-        curr: 1,
-        total: 0,
-      },
-      // 表格 - 列参数
-      columns: listCol,
-      supplierNo: [],
-      brandid: [],
-    };
-  },
   mounted() {
-    this.select = "1";
-    this.supplierNo = [];
-    this.brandid = [];
+    this.tableData = [];
     this.searchList();
   },
   methods: {
-    restSearch() {
-      this.select = "1";
-      this.supplierNo = [];
-      this.brandid = [];
-      // 表格 - 分页
-      this.pageInfo = {
-        size: 15,
-        curr: 1,
-        total: 0,
-      };
-      this.parmValue = {
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-        start: "",
-        end: "",
-        status: "",
-        good_name: "",
-        spucode: "",
-        cat_id: [],
-        brandid: "",
-        good_type: "",
-        isonline: "",
-        companyNo: "",
-        supplierNo: "",
-      };
-      this.searchList();
-    },
-    wantto(isonline, code, ntype, wtype) {
-      console.log(isonline);
-      if (isonline + "" === "1") {
-        this.$message.warning("已上线的商品需要下线才能修改！");
-        return;
-      }
-      if (ntype === "0") {
-        this.$message.warning("新建商品成正在审核中,请审核结束后再修改！");
-        return;
-      }
-      if (ntype === "2") {
-        if (wtype === "2") {
-          this.$message.warning("商品基础信息已修改,请等待审核结果！");
-          return;
-        }
-        if (wtype === "3") {
-          this.$message.warning(
-            "商品基础信息修改流程正在审核中,请审核结束后再修改！"
-          );
-          return;
-        }
-      }
-      if (ntype === "3") {
-        if (wtype === "3") {
-          this.$message.warning("商品成本信息已修改,请等待审核结果！");
-          return;
-        }
-        if (wtype === "2") {
-          this.$message.warning(
-            "商品成信息修改流程正在审核中,请审核结束后再修改！"
-          );
-          return;
-        }
-      }
-      console.log(ntype + "----" + wtype);
-      this.routeGoto("goodsCostDetail", {
-        id: code,
-        type: wtype === "2" ? "editBase" : wtype === "3" ? "editCoin" : "",
-      });
-    },
-    selection_change(e) {
-      const { list } = e;
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
-    },
-    //商品品牌选择
-    async brandidsearchChange(e) {
-      const { id, code, label } = e;
-      if (id) {
-        this.brandid = [id];
-      } else {
-        this.brandid = [];
-      }
-      this.parmValue.brandid = this.brandid.toString();
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
-    },
-    // 时间
-    async handleTime(e) {
-      this.parmValue.start = e.startTime || "";
-      this.parmValue.end = e.endTime || "";
+    //初始化请求
+    async searchList() {
       if (
-        (this.parmValue.start !== "" && this.parmValue.end !== "") ||
-        (this.parmValue.start === "" && this.parmValue.end === "")
+        (this.parmValue.platform_time_start !== "" &&
+          this.parmValue.platform_time_end === "") ||
+        (this.parmValue.platform_time_start === "" &&
+          this.parmValue.platform_time_end !== "")
       ) {
-        this.pageInfo.curr = 1;
-        this.parmValue.page = 1;
-        await this.searchList();
+        this.$message.warning("平台下单时间区间不完整！");
+        return;
       }
-    },
-    async good_copy(spuCode) {
-      await this.$confirm(`确定要复制该商品？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          this.loading = true;
-          const model = {
-            spuCode: spuCode,
-          };
-          const res = await asyncRequest.copy(model);
-          if (res && res.code === 0) {
-            this.loading = false;
-            this.$notify.success({
-              title: "复制商品成功！",
-              message: "",
-            });
-            await this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.loading = false;
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-    /**
-     * 启用/禁用
-     * @param {String} id id
-     * @param {String} status 0-禁用 1-启用
-     */
-    async changeStatus(id, status) {
-      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          this.loading = true;
-          const model = {
-            id: id,
-            status: status === "1" ? "0" : "1",
-          };
-          const res = await asyncRequest.status(model);
-          if (res && res.code === 0) {
-            this.loading = false;
-            this.$notify.success({
-              title: "状态修改成功！",
-              message: "",
-            });
-            await this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.loading = false;
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-    async deleteItem(code) {
-      await this.$confirm("确定要删除？", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const model = {
-            codes: [code],
-          };
-          const res = await asyncRequest.delete(model);
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "删除成功",
-              message: "",
-            });
-            this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-    // 刷新表格
-    async searchList() {
       if (
-        (this.parmValue.start !== "" && this.parmValue.end === "") ||
-        (this.parmValue.start === "" && this.parmValue.end !== "")
+        (this.parmValue.addtime_start !== "" &&
+          this.parmValue.addtime_end === "") ||
+        (this.parmValue.addtime_start === "" &&
+          this.parmValue.addtime_end !== "")
       ) {
-        this.$message.warning("时间区间不完整！");
+        this.$message.warning("导入时间区间不完整！");
         return;
       }
       this.loading = true;
-      this.parmValue.spucode = this.select === "1" ? this.sinput : "";
-      this.parmValue.good_name = this.select === "2" ? this.sinput : "";
-      this.parmValue.companyNo = this.select === "3" ? this.sinput : "";
-      this.parmValue.supplierNo = this.select === "4" ? this.sinput : "";
-      let item = JSON.parse(JSON.stringify(this.parmValue));
-      item.cat_id =
-        item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
-      const res = await asyncRequest.list(item);
+      let res = await asyncRequest.orderimportlist(this.parmValue);
       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.$message.warning(res.message);
         this.pageInfo.total = 0;
       }
       this.loading = false;
     },
-    //商品分类选择
-    async goods_class_change(e) {
-      this.parmValue.cat_id = e;
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
+    //导入时间
+    async addtime(e) {
+      this.parmValue.addtime_start = e.startTime || "";
+      this.parmValue.addtime_end = e.endTime || "";
       await this.searchList();
     },
-    add_online() {
-      if (this.changeList.length === 0) {
-        this.$message.warning("至少选择一个商品！");
+    //平台时间
+    async platformTime(e) {
+      this.parmValue.platform_time_start = e.startTime || "";
+      this.parmValue.platform_time_end = e.endTime || "";
+      await this.searchList();
+    },
+    //批量关联库存规则判断
+    selectStockIf() {
+      if (this.changeList.length <= 0) {
+        this.$message.warning(`请勾选需要关联的商品`);
         return;
       }
-      if (this.changeList.length > 100) {
-        this.$message.warning("商品数量不能超过100！");
+      let flag = false;
+      try { 
+        this.changeList.forEach((item, index) => {
+          if (item.status == "4") {
+            if (item.plat_code == this.changeList[0].plat_code) {
+            } else {
+              this.$message.warning(`选中的商品平台商品编号不一致`);
+              flag = false;
+              throw new Error("End Loop");
+            }
+          } else {
+            this.$message.warning(`当前第${index + 1}行状态不是库存不足品`);
+            flag = false;
+            throw new Error("End Loop");
+          }
+          flag = true;
+        });
+
+      } catch {}
+      console.log("判断函数",flag)
+      return flag
+    },
+
+    //批量关联库存
+    async selectStock() {
+      
+      
+
+      if (!this.selectStockIf()) {
         return;
       }
-      let isok = true;
-      this.changeList.forEach((e) => {
-        if (e.status !== "1") {
-          isok = false;
-        }
-      });
-      if (!isok) {
-        this.$message.warning("只有审核通过的商品可以上线！");
-        return;
+
+      let ids = [];
+      let plat_code = this.changeList[0].plat_code;
+      this.changeList.forEach((item)=>{
+        ids.push(item.id)
+      })
+      let model = {
+        ids,
+        plat_code
+      };
+      let res = await asyncRequest.relationstockbatch(model);
+      if (res && res.code === 0) {
+        console.log(res)
+        this.$message.success(res.message);
+        this.searchList()
+        //成功展示弹窗
+        // this.centerDialogVisible = true;
+        
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
       }
-      this.showModel = true;
+
+      
+    },
+    //重置按钮
+    reset() {
+      this.parmValue = {
+        status: "1",
+        platform_code: "",
+        // cs3: "",
+        po_code: "",
+        plat_code: "",
+        // cs6: "",
+        platform_time_end: "",
+        platform_time_start: "",
+        addtime_end: "",
+        addtime_start: "",
+        page: 1,
+        size: 15,
+      };
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.searchList();
+    },
+    //搜索按钮
+    search() {
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      this.searchList();
+    },
+    //订单导入入口
+    entry(){
+      this.$router.push("/orderEntry/orderImport")
+    },
+
+    //选中触发函数
+    selection_change(e) {
+      console.log(e);
+      const { list } = e;
+      //选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+.box {
+  width: 100%;
+  padding: 8px 12px 0 10px;
+}
+.searchBox {
+  width: 100%;
+  padding-right: 12px;
+
+  box-sizing: border-box;
+  // padding-top: 15px;
+  // margin-top: 20px;
+  display: flex;
+  flex-wrap: wrap;
+}
+.form {
+  width: 100%;
+  padding-left: 50px;
+  box-sizing: border-box;
+}
+.el-row {
+  display: flex;
+}
+/deep/ .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+.btn {
+  height: 36px;
+  margin-left: 0px;
+  display: flex;
+  align-items: center;
+}
+.tableBox {
+  width: 100%;
+  margin-top: 20px;
+}
+.entry{
+  position: absolute;
+  top: 69px;
+  left: -1px;
+}
+/deep/ .el-dropdown-selfdefine ,.entry {
+  background: #63cbe7;
+  color: #fff;
+  font-weight: bold;
+  border: none;
+  height: 36px;
+  bottom: 0;
+}
 </style>

src/views/orderEntry/orderImport/columns.js

@@ -36,21 +36,21 @@ const columns = [
     label: "数量",
     width: "140px",
   },
-  {
-    prop: "before_discount_all_price",
-    label: "优惠前总金额",
-    width: "140px",
-  },
+  // {
+  //   prop: "before_discount_all_price",
+  //   label: "优惠前总金额",
+  //   width: "140px",
+  // },
   {
     prop: "discount_price",
     label: "优惠金额",
     width: "140px",
   },
-  {
-    prop: "after_price",
-    label: "商品优惠后的金额",
-    width: "140px",
-  },
+  // {
+  //   prop: "after_price",
+  //   label: "商品优惠后的金额",
+  //   width: "140px",
+  // },
   {
     prop: "activity_name",
     label: "优惠活动名称",
@@ -81,14 +81,14 @@ const columns = [
     label: "联系地址",
     width: "140px",
   },
-//   {
-//     prop: "",
-//     label: "操作",
-//     fixed: "right",
-//       _noset_: true,
-//     width: "50px",
-//       _slot_: "operation",
-//   },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+      _noset_: true,
+    width: "50px",
+      _slot_: "operation",
+  },
 ]
 export {
   columns

src/views/orderEntry/orderImport/index.vue

@@ -1,21 +1,15 @@
 <template>
   <div class="box">
-      <div class="con">
-          <h1>订单导入</h1>
-        <upload-excel :on-success="handleSuccess" :before-upload="beforeUpload" />
-        <h1 style="color:#0099FF;">用户导入字段</h1>
-        <ex-table
-            :columns="columns"
-            :table="table"
-            :data="tableData"
-        >
-
-        </ex-table>
-      </div>
-      <div class="btn">
-            <el-button type="primary" @click="submit">提交</el-button>
-          <el-button @click="cancel">取消</el-button>
-      </div>
+    <div class="con">
+      <h1>订单导入</h1>
+      <upload-excel :on-success="handleSuccess" :before-upload="beforeUpload" />
+      <h1 style="color: #0099ff">用户导入字段</h1>
+      <ex-table :columns="columns" :table="table" :data="tableData"> </ex-table>
+    </div>
+    <div class="btn">
+      <el-button type="primary" @click="submit">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
   </div>
 </template>
 
@@ -23,14 +17,11 @@
 import asyncRequest from "@/apis/service/orderEntry/orderImport";
 import resToken from "@/mixins/resToken";
 import { province_list, city_list, county_list } from "@/assets/js/area-data";
-import {columns} from "./columns";
+import { columns } from "./columns";
 export default {
   mixins: [resToken],
   data() {
-      
     return {
-        
-      
       ruleForm: {
         order_addr: [], //收货地址
       },
@@ -50,8 +41,6 @@ export default {
       },
       // 表格 - 列参数
       columns: columns,
-
-
     };
   },
   methods: {
@@ -67,7 +56,7 @@ export default {
       return false;
     },
     handleSuccess({ results, header }) {
-      console.log("表格导入数据",results,"表格表头",header)
+      console.log("表格导入数据", results, "表格表头", header);
       if (results.length === 0) {
         this.$message.error("表格无有效数据！");
         return;
@@ -80,15 +69,15 @@ export default {
         "平台商品编号",
         "单价（元）",
         "数量",
-        "优惠前总金额",
-        "优惠金额",
-        "商品优惠后金额",
+        // "优惠前总金额",
+        "订单总金额",
+        // "商品优惠后金额",
         "优惠活动名称",
         "收费模式",
-        "订单备注",
         "收货人",
         "联系电话",
-        "联系地址"
+        "联系地址",
+        "订单备注",
       ];
       if (head.length !== header.length) {
         // console.log("自定义head长度",head.length)
@@ -99,96 +88,143 @@ export default {
       let hederOk = true;
       head.forEach((v1, i1) => {
         if (v1 !== header[i1].replace(/\s*/g, "")) {
-          console.log(v1)
-          console.log(header[i1])
+          console.log(v1);
+          console.log(header[i1]);
           hederOk = false;
         }
       });
 
       if (!hederOk) {
-        console.log(hederOk)
+        console.log(hederOk);
         this.$message.error("表头与导入模板不匹配！");
         return;
       }
       this.tableHeader = header;
       this.tableData = [];
       let list = results;
+      // let tableOk = true;
       this.ruleForm.order_addr = [];
       list.forEach((v1) => {
-        
         let b = Object.values(v1);
-        
+
+        // let item = this.get_code(b[3], b[4], b[5]);
         let model = {
           platform_code: b[0] + "",
           po_code: b[1] + "",
-          platform_time: b[2] + "",
+          platform_time: this.formatDate(b[2], "/") + "",
           sale_source: b[3] + "",
           plat_code: b[4] + "",
           price: b[5] + "",
           num: b[6] + "",
-          before_discount_all_price: b[7] + "",
-          discount_price: b[8] + "",
-          after_price: b[9] + "",
-          activity_name: b[10] + "",
-          mode: b[11] + "",
-          order_remark: b[12] + "",
-          contactor: b[13] + "",
-          mobile: b[14] + "",
-          addr: b[15] + "",
-          
+          // before_discount_all_price: b[7] + "",
+          discount_price: b[7] + "",
+          // after_price: b[9] + "",
+          activity_name: b[8] + "",
+          mode: b[9] + "",
+          contactor: b[10] + "",
+          mobile: b[11] + "",
+          addr: b[12] + "",
+          order_remark: b[13] + "",
         };
-       
+
         this.tableData.push(model);
       });
 
-      
+      console.log(this.tableData);
     },
-  
     //取消
-    cancel(){
+    cancel() {
       this.tableData = [];
     },
+    //日期转换
+    formatDate(numb, format) {
+      const time = new Date((numb - 1) * 24 * 3600000 + 1);
+      time.setYear(time.getFullYear() - 70);
+      const year = time.getFullYear() + "";
+      const month = time.getMonth() + 1 + "";
+      const date = time.getDate() + "";
+      if (format && format.length === 1) {
+        return year + format + month + format + date;
+      }
+      return (
+        year +
+        (month < 10 ? "0" + month : month) +
+        (date < 10 ? "0" + date : date)
+      );
+    },
     //提交
-   async submit(){
-     const model = {
-       list:this.tableData
-     }
-      console.log(model)
-      const res = await asyncRequest.orderimport(model)
-      console.log(res)
+    async submit() {
+      const model = {
+        list: this.tableData,
+      };
+
+      let obj = [
+        { name: "平台订单号", str: "platform_code" },
+        { name: "销售渠道", str: "sale_source" },
+        { name: "平台商品编号", str: "plat_code" },
+        { name: "单价（元）", str: "price" },
+        { name: "收货人", str: "contactor" },
+        { name: "联系电话", str: "mobile" },
+        { name: "联系地址", str: "addr" },
+      ];
+      let flag = true;
+      model.list.forEach((item, index) => {
+        if (flag) {
+        } else {
+          return;
+        }
+        for (let i = 0; i < obj.length; i++) {
+          let txt = item[obj[i].str].trim();
+          if (txt == "") {
+            this.$message.warning(`第${index + 1}行的${obj[i].name}不能为空`);
+            flag = false;
+            break;
+          } else {
+            flag = true;
+          }
+        }
+      });
+      
+      if(flag){
+        this.submitHttp(model)
+      }
+    },
+    async submitHttp(model) {
+      const res = await asyncRequest.orderimport(model);
       if (res && res.code === 0) {
         this.$notify.success({
           title: "成功！",
           message: "",
         });
+
+        this.tableData = [];
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
         this.$message.warning(res.message);
       }
-     
-    }
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.box{
-    width: 100%;
+.box {
+  width: 100%;
 }
-.con{
-    width: 100%;
+.con {
+  width: 100%;
 
-    h1{
-        margin: 30px 0 30px 20px;
-        font-size: 26px;
-        color: #333;
-    }
+  h1 {
+    margin: 30px 0 30px 20px;
+    font-size: 26px;
+    color: #333;
+  }
 }
-.btn{
-    width: 50%;
-    margin: 50px auto 0;
-    display: flex;
-    justify-content: space-around;
+.btn {
+  width: 50%;
+  margin: 50px auto 0;
+  display: flex;
+  justify-content: space-around;
 }
 </style>

src/views/purchaseIn/workbench/detail.vue

@@ -27,6 +27,8 @@
                 <li>{{ sitem.salesman }}</li>
                 <li>到货时间：</li>
                 <li>{{ sitem.arrival_time }}</li>
+                <li>客户名称：</li>
+                <li>{{ sitem.khname }}</li>
               </ul>
             </div>
             <div class="left-card" v-if="sitem">
@@ -345,6 +347,7 @@ export default {
         const { status } = data;
         this.status = status;
         this.sitem = JSON.parse(JSON.stringify(data));
+        
         const { can } = this.sitem;
         this.sitem.is_metal = "";
         this.sitem.can_id_arr = [];
@@ -369,6 +372,7 @@ export default {
       } else {
         this.$message.warning(message);
       }
+      
     },
     async well_timer() {
       this.timer = setInterval(async () => {

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

@@ -244,7 +244,7 @@ export default {
       statusOptions: [
         { id: "0", label: "待公司采购" },
         { id: "1", label: "待库管发货" },
-        { id: "2", label: "待收货" },
+        { id: "2", label: "已发货待收货" },
         { id: "3", label: "已收货" },
         { id: "4", label: "已全部退货" },
       ],

src/views/sellOut/sellOutOrder/columns.js

@@ -73,14 +73,14 @@ const columns = [
   //   label: "联系电话",
   //   width: "100"
   // },
-  // {
-  //   prop: "post_name",
-  //   label: "物流公司",
-  // },
-  // {
-  //   prop: "post_code",
-  //   label: "物流单号",
-  // },
+  {
+    prop: "post_name",
+    label: "物流公司",
+  },
+  {
+    prop: "post_code",
+    label: "物流单号",
+  },
   {
     prop: "post_fee",
     label: "物流费用",

src/views/sellOut/sellOutOrder/detail.vue

@@ -379,7 +379,7 @@ export default {
       statusOptions: [
         { value: "0", label: "待采购备货" },
         { value: "1", label: "待库管发货" },
-        { value: "2", label: "待收货" },
+        { value: "2", label: "已发货待收货" },
         { value: "3", label: "已收货" },
         { value: "4", label: "已全部退货" },
       ],

src/views/sellOut/sellOutOrder/index.vue

@@ -227,7 +227,7 @@ export default {
       statusOptions: [
         { id: "0", label: "待发货" },
         { id: "1", label: "待库管发货" },
-        { id: "2", label: "待收货" },
+        { id: "2", label: "已发货待收货" },
         { id: "3", label: "已收货" },
         { id: "4", label: "已全部退货" },
       ],

src/views/sellOut/zixunOrder/components/addEditGoodModal.vue

@@ -926,9 +926,6 @@ export default {
 .lsac{
   font-weight: bold;
   font-size: 14px;
-  position: absolute;
   color: #777;
-  top: 0;
-  right: 0;
 }
 </style>