Merge branch 'sit'

src/apis/service/reportQuery/purchaseReport/index.js

@@ -13,11 +13,11 @@ export default {
   // 更新
   update: (data, params) => http(api + "cgdedit", data, "post", params),
   
-   //咨询单总数
+   //竞价单总数
    reportzixuntotal: (data, params) => http(api + "reportzixuntotal", data, "post", params),
    //采购订单总金额
    reportpurcheaseordersum: (data, params) => http(api + "reportpurcheaseordersum", data, "post", params),
-   //采购员回复咨询单数
+   //采购员回复竞价单数
    reportconsultbidssum: (data, params) => http(api + "reportconsultbidssum", data, "post", params),
    //采购员订单金额
    reportpurcheaseordersumbyuser: (data, params) => http(api + "reportpurcheaseordersumbyuser", data, "post", params),

src/apis/service/reportQuery/saleReport/index.js

@@ -17,9 +17,9 @@ export default {
   saleexportconsultday: (data, params) => http(api + "saleexportconsultday", data, "post", params),
   //日报导出
   saleexportconsultdayexport: (data, params) => http(api + "saleexportconsultdayexport", data, "post", params),
-  //咨询单报表
+  //竞价单报表
   saleexportconsultinfo: (data, params) => http(api + "saleexportconsultinfo", data, "post", params),
-  //咨询单报表导出
+  //竞价单报表导出
   saleexportconsultinfoexport: (data, params) => http(api + "saleexportconsultinfoexport", data, "post", params),
   //订单报表
   saleexportlist: (data, params) => http(api + "saleexportlist", data, "post", params),
@@ -56,9 +56,9 @@ export default {
   saleexportsaledetailed: (data, params) => http(api + "saleexportsaledetailed", data, "post", params),
   //订单导出表导出
   saleexportsaledetailedexport: (data, params) => http(api + "saleexportsaledetailedexport", data, "post", params),
-  //咨询单导出明细
+  //竞价单导出明细
   saleexportconsultdetailed: (data, params) => http(api + "saleexportconsultdetailed", data, "post", params),
-  //咨询单导出明细导出
+  //竞价单导出明细导出
   saleexportconsultdetailedexport: (data, params) => http(api + "saleexportconsultdetailedexport", data, "post", params),
   //工差明细表
   saleexportsalediff: (data, params) => http(api + "saleexportsalediff", data, "post", params),

src/apis/service/sellOut/zixunOrder/index.js

@@ -23,9 +23,9 @@ export default {
   pdetail: (data, params) => http(api + "projectinfo", data, "post", params),
   // 议价单创建
   bargain_add: (data, params) => http(api + "consultbaradd", data, "post", params),
-  // 咨询单选定商品
+  // 竞价单选定商品
   bidscheck: (data, params) => http(api + "bidscheck", data, "post", params),
-  // 咨询商品下单
+  // 竞价商品下单
   consultorder: (data, params) => http(api + "consultorder", data, "post", params),
   // 区编码获取省市区汉字
   addrall: (data, params) => http(api + "addrall", data, "post", params),

src/assets/js/btnList.js

@@ -68,7 +68,7 @@ const btnList = [
   { code: "067", name: "招标任务启动" },
   { code: "068", name: "发起议价" },
   { code: "069", name: "选定商品" },
-  { code: "070", name: "非项目咨询单下单" },
+  { code: "070", name: "非项目竞价单下单" },
   { code: "071", name: "操作上线" },
   { code: "072", name: "查看支持品牌列表" },
   { code: "073", name: "添加支持品牌" },

src/assets/js/statusList.js

@@ -5,7 +5,7 @@ const statusList = [
 const cg_order_type_options = [
   { id: "1", label: "备库单" },
   { id: "2", label: "线上非库存品" },
-  { id: "3", label: "咨询采反" },
+  { id: "3", label: "竞价采反" },
   { id: "4", label: "项目采反" },
   { id: "5", label: "平台部线上库存品" },
   { id: "6", label: "平台部线上非库存品" },
@@ -13,7 +13,7 @@ const cg_order_type_options = [
 const xs_order_type_options = [
   { id: "1", label: "线上库存品" },
   { id: "2", label: "线上非库存品" },
-  { id: "3", label: "咨询采反" },
+  { id: "3", label: "竞价采反" },
   { id: "4", label: "项目采反" },
   { id: "5", label: "平台部线上库存品" },
   { id: "6", label: "平台部线上非库存品" },

src/views/goodStore/dealGoodsPool/index.vue

@@ -321,7 +321,7 @@ export default {
     },
     show_view(keyRow) {
       this.row = keyRow;
-      this.row.dtitle = "咨询成交商品详情";
+      this.row.dtitle = "竞价成交商品详情";
       this.visible = true;
     },
     restSearch() {

src/views/goodStore/goodsCost/index.vue

@@ -422,7 +422,7 @@ export default {
         },
         {
           code: "8",
-          name: "咨询商品待编辑",
+          name: "竞价商品待编辑",
           type: "info",
         },
       ],

src/views/orderEntry/orderEnter/index.vue

@@ -277,7 +277,7 @@ export default {
     return {
       // centerDialogVisible: false,
       loading: true,
-      //咨询类型
+      //竞价类型
       statusArr: [
         { value: "1", label: "系统验证数据中" },
         { value: "2", label: "待确认订单信息" },

src/views/process/columns.js

@@ -84,7 +84,7 @@ const routerList = [
     to: "code",
   },
   {
-    name: "咨询单流程",
+    name: "竞价单流程",
     type: "ZXD",
     toRouter: "/sellOut/zixunOrderDetail",
     to: "code",

src/views/purchaseIn/purchaseDiffOrder/detail.vue

@@ -132,11 +132,11 @@ export default {
       customer_remark_options: [
         {
           value: "1",
-          label: "咨询订单减工差",
+          label: "竞价订单减工差",
         },
         {
           value: "2",
-          label: "咨询订单不减工差",
+          label: "竞价订单不减工差",
         },
       ],
       is_act_options: [
@@ -164,7 +164,7 @@ export default {
       loading: false,
       queryId: "",
       orderCode: "", //审批记录的code
-      order_type: "", //用于判断订单是备库单还是咨询单
+      order_type: "", //用于判断订单是备库单还是竞价单
       type: "", //审批记录
     };
   },
@@ -239,7 +239,7 @@ export default {
         this.getNewTime();
         // if (this.order_type === "2") {
         //   this.order_type = res.data.cgdNo;
-        //   this.statusOptions.unshift({ value: "0", label: "咨询单" });
+        //   this.statusOptions.unshift({ value: "0", label: "竞价单" });
         // }
         // this.order_type === "1" ? "CGGCD" : "ZXGCD";
         // this.order_type = res.data.order_type;

src/views/purchaseIn/purchaseReturn/columns.js

@@ -24,7 +24,7 @@ export default [
   {
     prop: "order_type",
     label: "退货来源",
-    // 1备库 2咨询
+    // 1备库 2竞价
     _slot_: "order_type",
     width: "80px"
   },

src/views/purchaseIn/purchaseReturn/components/columns.js

@@ -85,7 +85,7 @@ export default [
   // {
   //   prop: "order_type",
   //   label: "退货来源",
-  //   // 1备库 2咨询
+  //   // 1备库 2竞价
   //   _slot_: "order_type",
   //   width: "120px"
   // },

src/views/purchaseIn/recovery/columns.js

@@ -1,12 +1,12 @@
 const columns = [
   {
     prop: "zxNo",
-    label: "咨询单编号",
+    label: "竞价单编号",
     width: "158px",
   },
   {
     prop: "infoNo",
-    label: "咨询阶梯编号",
+    label: "竞价阶梯编号",
     width: "155px",
   },
 

src/views/purchaseIn/recovery/index.vue

@@ -29,7 +29,7 @@
               <el-col :span="6" style="width: 200px">
                 <el-input
                   clearable
-                  placeholder="咨询单编号"
+                  placeholder="竞价单编号"
                   v-model="parmValue.infoNo"
                   maxlength="40"
                   :size="searchSize"

src/views/purchaseIn/workbench/detail.vue

@@ -23,7 +23,7 @@
                 <li>{{ sitem.num }}{{ sitem.unit_name }}</li>
                 <li>预算单价：</li>
                 <li>{{ sitem.original_price }}元</li>
-                <li>咨询人：</li>
+                <li>竞价人：</li>
                 <li>{{ sitem.salesman }}</li>
                 <li>到货时间：</li>
                 <li>{{ sitem.arrival_time }}</li>

src/views/purchaseIn/workbench/index.vue

@@ -7,7 +7,7 @@
     >
       <ul class="clear po-ul">
         <li class="po-li">
-          <div class="taskTitle color1">咨询单任务</div>
+          <div class="taskTitle color1">竞价单任务</div>
           <div class="taskList clear">
             <div
               class="task-item"

src/views/reportQuery/purchaseReport/components/columns.js

@@ -1,4 +1,4 @@
-//咨询单总数
+//竞价单总数
 const table1 = [
   // {
   //   type: "expand",
@@ -13,7 +13,7 @@ const table1 = [
   // },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
   {
@@ -23,7 +23,7 @@ const table1 = [
   },
   {
     prop: "total",
-    label: "咨询数量",
+    label: "竞价数量",
     minWidth: "155px",
   },
 ]
@@ -42,7 +42,7 @@ const table2 = [
   // },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
   {
@@ -71,7 +71,7 @@ const table2 = [
     minWidth: "155px",
   },
 ]
-//采购员回复咨询单数
+//采购员回复竞价单数
 const table3 = [
   // {
   //   type: "expand",
@@ -175,7 +175,7 @@ const table5 = [
   },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
   {
@@ -185,7 +185,7 @@ const table5 = [
   },
   {
     prop: "zxNo",
-    label: "咨询订单号",
+    label: "竞价订单号",
     minWidth: "155px",
   },
   {
@@ -275,7 +275,7 @@ const table6 = [
   },
   {
     prop: "zxNo",
-    label: "咨询订单号",
+    label: "竞价订单号",
     minWidth: "155px",
   },
   {
@@ -295,7 +295,7 @@ const table6 = [
   },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
   {
@@ -961,7 +961,7 @@ const editTable13 = [
   },
   {
     prop: "zxNo",
-    label: "咨询编号",
+    label: "竞价编号",
     minWidth: "200px",
   },
   {

src/views/reportQuery/purchaseReport/components/table1.vue

@@ -6,7 +6,7 @@
           <periodDatePickerActive
             :start="parmValue.start_date"
             :end="parmValue.end_date"
-            :placeholder="'咨询'"
+            :placeholder="'竞价'"
             :width="'165px'"
             :size="searchSize"
             @timeReturned="time"

src/views/reportQuery/purchaseReport/components/table14.vue

@@ -156,7 +156,7 @@ export default {
       //请求参数集合
       parmValue: {
           select:"",
-        xiugai1:"", //咨询订单号
+        xiugai1:"", //竞价订单号
         xiugai2:"",
         start_date: "", //起始时间
         end_date: "", // 结束时间

src/views/reportQuery/purchaseReport/components/table2.vue

@@ -6,7 +6,7 @@
           <periodDatePickerActive
             :start="parmValue.start_date"
             :end="parmValue.end_date"
-            :placeholder="'咨询'"
+            :placeholder="'竞价'"
             :width="'165px'"
             :size="searchSize"
             @timeReturned="time"

src/views/reportQuery/purchaseReport/components/table5.vue

@@ -29,7 +29,7 @@
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
-                      :placeholder="'咨询'"
+                      :placeholder="'竞价'"
                       :width="'165px'"
                       :size="searchSize"
                       @timeReturned="time"
@@ -56,7 +56,7 @@
               <el-col :span="6" style="width: 240px">
                 <el-input
                   clearable
-                  placeholder="咨询订单号"
+                  placeholder="竞价订单号"
                   v-model="parmValue.zxNo"
                   maxlength="40"
                   :size="searchSize"
@@ -118,7 +118,7 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        zxNo:"", //咨询订单号
+        zxNo:"", //竞价订单号
         start_date: "", //起始时间
         end_date: "", // 结束时间
         page: 1, // 页码
@@ -180,7 +180,7 @@ export default {
     //重置
     restSearch() {
       this.parmValue = {
-        zxNo:"", //咨询订单号
+        zxNo:"", //竞价订单号
         start_date: "", //起始时间
         end_date: "", // 结束时间
         page: 1, // 页码

src/views/reportQuery/purchaseReport/components/table5.vue.rej

@@ -3,7 +3,7 @@ diff a/src/views/reportQuery/purchaseReport/components/table5.vue b/src/views/re
      //重置
      restSearch() {
        this.parmValue = {
--        zxNo:"", //咨询订单号
+-        zxNo:"", //竞价订单号
 -        start_date: "", //起始时间
 -        end_date: "", // 结束时间
 +        start_date: "", //新建起始时间

src/views/reportQuery/purchaseReport/components/table6.vue

@@ -29,7 +29,7 @@
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
-                      :placeholder="'咨询'"
+                      :placeholder="'竞价'"
                       :width="'165px'"
                       :size="searchSize"
                       @timeReturned="time"

src/views/reportQuery/purchaseReport/index.vue

@@ -5,10 +5,10 @@
     >
         <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
         <el-tabs v-model="activeName">
-            <el-tab-pane label="咨询单总数" name="table1"><table1 v-if="activeName == 'table1'"></table1></el-tab-pane>
+            <el-tab-pane label="竞价单总数" name="table1"><table1 v-if="activeName == 'table1'"></table1></el-tab-pane>
 
             <el-tab-pane label="采购订单总金额" name="table2"><table2 v-if="activeName == 'table2'"></table2></el-tab-pane>
-            <el-tab-pane label="采购员回复咨询单数" name="table3"><table3 v-if="activeName == 'table3'"></table3></el-tab-pane>
+            <el-tab-pane label="采购员回复竞价单数" name="table3"><table3 v-if="activeName == 'table3'"></table3></el-tab-pane>
             <el-tab-pane label="采购员订单金额" name="table4"><table4 v-if="activeName == 'table4'"></table4></el-tab-pane>
             <el-tab-pane label="已采返报价信息" name="table5"><table5 v-if="activeName == 'table5'"></table5></el-tab-pane>
             <el-tab-pane label="未采返信息" name="table6"><table6 v-if="activeName == 'table6'"></table6></el-tab-pane>

src/views/reportQuery/saleReport/components/columns.js

@@ -23,13 +23,13 @@ const table1 = [
   },
   {
     prop: "consult_num",
-    label: "当日咨询单数量",
+    label: "当日竞价单数量",
     minWidth: "155px",
   },
 
   {
     prop: "consult_money",
-    label: "当日咨询单金额",
+    label: "当日竞价单金额",
     minWidth: "155px",
   },
   {
@@ -85,7 +85,7 @@ const table1 = [
   },
 
 ]
-//咨询单报表
+//竞价单报表
 const table2 = [
   // {
   //   type: "expand",
@@ -110,13 +110,13 @@ const table2 = [
   },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
 
   {
     prop: "zxNo",
-    label: "咨询单号",
+    label: "竞价单号",
     minWidth: "155px",
   },
   {
@@ -803,7 +803,7 @@ const table9 = [
 ]
 
 
-//咨询单导出明细
+//竞价单导出明细
 const table10 = [
   // {
   //   type: "expand",
@@ -818,7 +818,7 @@ const table10 = [
   },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
   {
@@ -833,13 +833,13 @@ const table10 = [
   },
   {
     prop: "zxNo",
-    label: "咨询单号",
+    label: "竞价单号",
     minWidth: "155px",
   },
 
   // {
   //   prop: "",
-  //   label: "咨询类型",
+  //   label: "竞价类型",
   //   minWidth: "155px",
   // },
 
@@ -938,7 +938,7 @@ const table10 = [
   },
   {
     prop: "remark",
-    label: "咨询备注",
+    label: "竞价备注",
     minWidth: "155px",
   },
   {
@@ -948,7 +948,7 @@ const table10 = [
   },
   {
     prop: "bargain_code",
-    label: "上次咨询单单号",
+    label: "上次竞价单单号",
     minWidth: "155px",
   },
  
@@ -1291,7 +1291,7 @@ const table14 = [
   },
   {
     prop: "infoNo",
-    label: "咨询单编号",
+    label: "竞价单编号",
     minWidth: "155px",
   },
   {

src/views/reportQuery/saleReport/components/table10.vue

@@ -29,7 +29,7 @@
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
-                      :placeholder="'咨询'"
+                      :placeholder="'竞价'"
                       :width="'165px'"
                       :size="searchSize"
                       @timeReturned="time"
@@ -264,7 +264,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "咨询单导出明细.zip";
+              let excelName = "竞价单导出明细.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

src/views/reportQuery/saleReport/components/table2.vue

@@ -29,7 +29,7 @@
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
-                      :placeholder="'咨询'"
+                      :placeholder="'竞价'"
                       :width="'165px'"
                       :size="searchSize"
                       @timeReturned="time"
@@ -283,7 +283,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "咨询单报表.zip";
+              let excelName = "竞价单报表.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

src/views/reportQuery/saleReport/components/table5.vue.rej

@@ -3,7 +3,7 @@ diff a/src/views/reportQuery/purchaseReport/components/table5.vue b/src/views/re
      //重置
      restSearch() {
        this.parmValue = {
--        zxNo:"", //咨询订单号
+-        zxNo:"", //竞价订单号
 -        start_date: "", //起始时间
 -        end_date: "", // 结束时间
 +        start_date: "", //新建起始时间

src/views/reportQuery/saleReport/components/table6.vue

@@ -29,7 +29,7 @@
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
-                      :placeholder="'咨询'"
+                      :placeholder="'竞价'"
                       :width="'165px'"
                       :size="searchSize"
                       @timeReturned="time"

src/views/reportQuery/saleReport/components/table9.vue

@@ -29,7 +29,7 @@
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
-                      :placeholder="'咨询'"
+                      :placeholder="'竞价'"
                       :width="'165px'"
                       :size="searchSize"
                       @timeReturned="time"

src/views/reportQuery/saleReport/index.vue

@@ -7,7 +7,7 @@
         <el-tabs v-model="activeName">
             <el-tab-pane label="日报" name="table1"><table1 v-if="activeName == 'table1'"></table1></el-tab-pane>
 
-            <el-tab-pane label="咨询单报表" name="table2"><table2 v-if="activeName == 'table2'"></table2></el-tab-pane>
+            <el-tab-pane label="竞价单报表" name="table2"><table2 v-if="activeName == 'table2'"></table2></el-tab-pane>
             <el-tab-pane label="订单报表" name="table3"><table3 v-if="activeName == 'table3'"></table3></el-tab-pane>
             <el-tab-pane label="未发货报表" name="table4"><table4 v-if="activeName == 'table4'"></table4></el-tab-pane>
             <el-tab-pane label="未签收报表" name="table5"><table5 v-if="activeName == 'table5'"></table5></el-tab-pane>
@@ -15,7 +15,7 @@
             <el-tab-pane label="产品热销排行" name="table7"><table7 v-if="activeName == 'table7'"></table7></el-tab-pane>
             <!-- <el-tab-pane label="未开票报表" name="table8"><table8 v-if="activeName == 'table8'"></table8></el-tab-pane> -->
             <!-- <el-tab-pane label="订单导出表" name="table9"><table9 v-if="activeName == 'table9'"></table9></el-tab-pane> -->
-            <el-tab-pane label="咨询单导出明细" name="table10"><table10 v-if="activeName == 'table10'"></table10></el-tab-pane>
+            <el-tab-pane label="竞价单导出明细" name="table10"><table10 v-if="activeName == 'table10'"></table10></el-tab-pane>
             <el-tab-pane label="工差明细表" name="table11"><table11 v-if="activeName == 'table11'"></table11></el-tab-pane>
             <el-tab-pane label="退货明细表" name="table12"><table12 v-if="activeName == 'table12'"></table12></el-tab-pane>
             <el-tab-pane label="售后明细表" name="table13"><table13 v-if="activeName == 'table13'"></table13></el-tab-pane>

src/views/reportQuery/test/columns.js

@@ -89,13 +89,13 @@ const table1 = [
   },
   {
     prop: "consult_num",
-    label: "当日咨询单数量",
+    label: "当日竞价单数量",
     minWidth: "155px",
   },
 
   {
     prop: "consult_money",
-    label: "当日咨询单金额",
+    label: "当日竞价单金额",
     minWidth: "155px",
   },
   {
@@ -151,7 +151,7 @@ const table1 = [
   },
 
 ]
-//咨询单报表
+//竞价单报表
 const table2 = [
   // {
   //   type: "expand",
@@ -171,13 +171,13 @@ const table2 = [
   },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
 
   {
     prop: "zxNo",
-    label: "咨询单号",
+    label: "竞价单号",
     minWidth: "155px",
   },
   {
@@ -873,7 +873,7 @@ const table9 = [
 ]
 
 
-//咨询单导出明细
+//竞价单导出明细
 const table10 = [
   // {
   //   type: "expand",
@@ -888,7 +888,7 @@ const table10 = [
   },
   {
     prop: "addtime",
-    label: "咨询时间",
+    label: "竞价时间",
     minWidth: "155px",
   },
   {
@@ -903,13 +903,13 @@ const table10 = [
   },
   {
     prop: "zxNo",
-    label: "咨询单号",
+    label: "竞价单号",
     minWidth: "155px",
   },
 
   // {
   //   prop: "",
-  //   label: "咨询类型",
+  //   label: "竞价类型",
   //   minWidth: "155px",
   // },
 
@@ -1008,7 +1008,7 @@ const table10 = [
   },
   {
     prop: "remark",
-    label: "咨询备注",
+    label: "竞价备注",
     minWidth: "155px",
   },
   {
@@ -1018,7 +1018,7 @@ const table10 = [
   },
   {
     prop: "bargain_code",
-    label: "上次咨询单单号",
+    label: "上次竞价单单号",
     minWidth: "155px",
   },
  
@@ -1372,7 +1372,7 @@ const table14 = [
   },
   {
     prop: "total",
-    label: "咨询单编号",
+    label: "竞价单编号",
     minWidth: "155px",
   },
   {

src/views/sellOut/bargainList/columns.js

@@ -86,7 +86,7 @@ const editColumns = [
   },
   {
     prop: "infoNo",
-    label: "咨询单编号",
+    label: "竞价单编号",
     span: 6
   },
   {
@@ -163,7 +163,7 @@ const editColumns = [
   },
   {
     prop: "expire_day",
-    label: "咨询有效期",
+    label: "竞价有效期",
     append: '天',
     span: 4
   },
@@ -369,7 +369,7 @@ const listCol = [
 
   {
     prop: "infoNo",
-    label: "咨询单编号",
+    label: "竞价单编号",
     width: "155"
   },
 

src/views/sellOut/bargainList/index.vue

@@ -79,7 +79,7 @@
                   >
                     <el-option label="议价单编号" value="1" />
                     <el-option label="反馈商品编号" value="2" />
-                    <el-option label="咨询单编号" value="3" />
+                    <el-option label="竞价单编号" value="3" />
                     <el-option label="申请人部门" value="4" />
 
                   </el-select>
@@ -206,7 +206,7 @@ export default {
       modelId: 0,
       parmValue: {
         bidsNo: "", // 反馈编号
-        infoNo: "", // 咨询单编号
+        infoNo: "", // 竞价单编号
         status: "", // 状态
         bargainNo: "", //议价编号
         status: "", //售后申请单处理状态
@@ -296,7 +296,7 @@ export default {
       this.s_input = "";
       this.parmValue = {
         bidsNo: "", // 反馈编号
-        infoNo: "", // 咨询单编号
+        infoNo: "", // 竞价单编号
         bargainNo: "", //议价编号
         status: "", // 状态
         start: "",

src/views/sellOut/project/components/ShowDataTableColumns.js

@@ -3,7 +3,7 @@
 const editColumns = [
   {
     prop: "infoNo",
-    label: "咨询单编号",
+    label: "竞价单编号",
     span: 6
   },
   {

src/views/sellOut/project/components/addForm.vue

@@ -92,7 +92,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="咨询截止时间" prop="endtime">
+            <el-form-item label="竞价截止时间" prop="endtime">
               <el-date-picker
                 v-model="ruleForm.endtime"
                 type="datetime"
@@ -344,7 +344,7 @@ export default {
         endtime: [
           {
             required: true,
-            message: "咨询截止时间不能为空！",
+            message: "竞价截止时间不能为空！",
             trigger: "change",
           },
         ],
@@ -415,7 +415,7 @@ export default {
         endtime &&
         new Date(endtime).getTime() >= new Date(arrtime).getTime()
       ) {
-        this.$message.warning("咨询截止时间不能大于要求到货时间！");
+        this.$message.warning("竞价截止时间不能大于要求到货时间！");
         if (type === 1) {
           this.ruleForm.arrtime = "";
         } else if (type === 2) {

src/views/sellOut/project/components/setPlan.vue

@@ -332,7 +332,7 @@
           </el-table-column>
           <el-table-column
             prop="origin_num"
-            label="咨询数量"
+            label="竞价数量"
             width="110"
             show-overflow-tooltip
           />

src/views/sellOut/returnOrder/index.vue

@@ -233,7 +233,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        order_type: "", //订单类型1为销售 2为咨询
+        order_type: "", //订单类型1为销售 2为竞价
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
@@ -336,7 +336,7 @@ export default {
         end: "", //
         status: "", //状态节点
         supplierName:'',
-        order_type: "", //订单类型1为销售 2为咨询
+        order_type: "", //订单类型1为销售 2为竞价
         page: 1, // 页码
         size: 15, // 每页显示条数
       };

src/views/sellOut/salesOrder/index.vue

@@ -398,7 +398,7 @@ export default {
       this.input = "";
       this.customerCode = [];
       this.parmValue = {
-        order_type: "", //订单类型1为销售 2为咨询
+        order_type: "", //订单类型1为销售 2为竞价
         orderCode: "", //销售订单code
         apply_name: "", // 申请人
         good_name: "", // 产品名称

src/views/sellOut/sellOutOrder/detail.vue

@@ -63,7 +63,7 @@
                 </template>
                 <template slot="order_type">
                   <el-tag :size="'mini'" :type="''">{{
-                    sitem.status === "1" ? "发货申请单" : "咨询发货申请单"
+                    sitem.status === "1" ? "发货申请单" : "竞价发货申请单"
                   }}</el-tag>
                 </template>
                 <template slot="sale_price">
@@ -390,8 +390,8 @@ export default {
       orderOptions: [
         { id: "1", label: "线上商品销售" },
         { id: "2", label: "项目线上商品销售" },
-        { id: "3", label: "咨询单销售" },
-        { id: "4", label: "项目咨询单销售" },
+        { id: "3", label: "竞价单销售" },
+        { id: "4", label: "项目竞价单销售" },
         { id: "5", label: "平台部订单销售" },
       ],
       statusOptions: [

src/views/sellOut/zixunOrder/columns.js

@@ -251,7 +251,7 @@ const edutRules = {
   endtime: [
     {
       required: true,
-      message: "咨询截止时间不能为空",
+      message: "竞价截止时间不能为空",
       trigger: "change",
     },
   ],
@@ -259,7 +259,7 @@ const edutRules = {
   is_project: [
     {
       required: true,
-      message: "请选择咨询类型！",
+      message: "请选择竞价类型！",
       trigger: "change",
     },
   ],
@@ -535,7 +535,7 @@ const feedbackListCol = [
 const listCol = [
   {
     prop: "infoNo",
-    label: "咨询编号",
+    label: "竞价编号",
     width: "160"
   },
   {
@@ -558,7 +558,7 @@ const listCol = [
   },
   {
     prop: "is_project",
-    label: "咨询单类型",
+    label: "竞价单类型",
     _slot_: "is_project",
     width: "110px",
   },
@@ -581,7 +581,7 @@ const listCol = [
   },
   {
     prop: "num",
-    label: "咨询数量",
+    label: "竞价数量",
     width: 110,
   },
   {

src/views/sellOut/zixunOrder/components/ShowDataTableColumns.js

@@ -3,7 +3,7 @@
 const editColumns = [
   {
     prop: "infoNo",
-    label: "咨询单编号",
+    label: "竞价单编号",
     span: 6
   },
   {
@@ -99,7 +99,7 @@ const ShowDataTableColumns = [
   },
   {
     prop: "in_num",
-    label: "咨询数量",
+    label: "竞价数量",
     _slot_: "in_num",
     span: 6,
   },

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

@@ -50,25 +50,25 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="咨询截止时间" prop="endtime" class="clear">
+        <el-form-item label="竞价截止时间" prop="endtime" class="clear">
           <el-date-picker
             v-model="ruleForm.endtime"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%"
             :picker-options="pickerOptions"
-            placeholder="咨询截止时间"
+            placeholder="竞价截止时间"
           >
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="咨询类型" prop="is_project" class="clear">
+        <el-form-item label="竞价类型" prop="is_project" class="clear">
           <el-select
             v-model="ruleForm.is_project"
             style="width: 100%"
             :disabled="false"
-            placeholder="咨询类型"
+            placeholder="竞价类型"
             @change="is_project_change"
           >
             <el-option
@@ -111,13 +111,13 @@
       </el-col>
       <el-col :span="8" v-if="ruleForm.is_project === '1'">
         <el-form-item
-          label="项目咨询截止时间"
+          label="项目竞价截止时间"
           class="clear"
           required
           label-width="140px"
         >
           <el-input
-            placeholder="项目咨询截止时间"
+            placeholder="项目竞价截止时间"
             v-model="ruleForm.pendtime"
             disabled
             maxlength="500"
@@ -214,7 +214,7 @@
         </el-form-item>
       </el-col>
       <el-co :span="24">
-        <el-form-item label="咨询商品要求" class="clear" required>
+        <el-form-item label="竞价商品要求" class="clear" required>
           <el-table
             :data="tableData"
             stripe
@@ -407,13 +407,13 @@ export default {
       },
       status: "", //存储详情接口返的状态
       ruleForm: {
-        is_project: "0", //咨询类型 1非项目2项目，
+        is_project: "0", //竞价类型 1非项目2项目，
         projectNo: [], //项目编号
         khNo: [], //客户编号
         customer_name: "", //客户名称
         companyNo: "",
-        endtime: "", //咨询截止时间
-        pendtime: "", //项目咨询截止时间
+        endtime: "", //竞价截止时间
+        pendtime: "", //项目竞价截止时间
         platform_code: "", //平台id
         use_desc: "",
         budget_total: "",
@@ -447,7 +447,7 @@ export default {
         endtime: [
           {
             required: true,
-            message: "咨询截止时间不能为空",
+            message: "竞价截止时间不能为空",
             trigger: "change",
           },
         ],
@@ -455,7 +455,7 @@ export default {
         is_project: [
           {
             required: true,
-            message: "请选择咨询类型！",
+            message: "请选择竞价类型！",
             trigger: "change",
           },
         ],
@@ -568,7 +568,7 @@ export default {
       }
       this.showModel = false;
     },
-    //咨询类型选择
+    //竞价类型选择
     is_project_change() {
       const { is_project } = this.ruleForm;
       if (is_project === "0") {
@@ -589,23 +589,23 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           let {
-            is_project, //咨询类型 1销售2咨询，
+            is_project, //竞价类型 1销售2竞价，
             projectNo, //项目编号
             khNo, //客户编号
             customer_name, //客户名称
             companyNo,
-            endtime, //咨询截止时间
+            endtime, //竞价截止时间
             platform_code, //平台id
             ladder,
           } = this.sitem;
 
           this.ruleForm = {
-            is_project: is_project || "0", //咨询类型 1项目 0 非项目
+            is_project: is_project || "0", //竞价类型 1项目 0 非项目
             projectNo: projectNo ? [projectNo] : [], //项目编号
             khNo: khNo ? [khNo] : [], //客户编号
             customer_name: customer_name || "", //客户名称
             companyNo: companyNo || this.business_companyNo || "",
-            endtime: endtime || "", //咨询截止时间
+            endtime: endtime || "", //竞价截止时间
             platform_code: platform_code || "", //平台id
             use_desc: "",
             budget_total: "",
@@ -637,12 +637,12 @@ export default {
             is_project === "1" &&
             new Date(endtime).getTime() > new Date(pendtime).getTime()
           ) {
-            this.$message.warning("咨询截止时间不能晚于项目咨询截止时间！");
+            this.$message.warning("竞价截止时间不能晚于项目竞价截止时间！");
             this.loading = false;
             return;
           }
           if (new Date(endtime).getTime() <= new Date().getTime()) {
-            this.$message.warning("咨询截止时间应该大于当前时间！");
+            this.$message.warning("竞价截止时间应该大于当前时间！");
             this.loading = false;
             return;
           }

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

@@ -427,7 +427,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8" class="fr" style="padding: 18px 0 0 0">
-                     <div class="lsac">咨询单总额：{{accMul(this.ruleForm.budget_price,this.ruleForm.num)}} (元)</div>
+                     <div class="lsac">竞价单总额：{{accMul(this.ruleForm.budget_price,this.ruleForm.num)}} (元)</div>
                     <el-button
                       v-if="id !== '007'"
                       type="primary"
@@ -481,7 +481,7 @@ export default {
         { value: "1", label: "启用" },
       ],
       config_options: ["证书", "包装盒", "绒布袋", "标签", "其他"],
-      title: "添加咨询商品",
+      title: "添加竞价商品",
       showModelThis: this.showModel,
       pickerOptions: {
         disabledDate(time) {
@@ -559,9 +559,9 @@ export default {
       const { index } = this.sitem;
       this.listindex = index + "";
       if (this.listindex === "-1") {
-        this.title = "添加咨询商品";
+        this.title = "添加竞价商品";
       } else {
-        this.title = "修改咨询商品";
+        this.title = "修改竞价商品";
       }
       this.rulesThis = this.rules;
       await this.resetForm();

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="'咨询单选定商品下单'"
+    :title="'竞价单选定商品下单'"
     :center="true"
     align="left"
     top="5vh"
@@ -680,7 +680,7 @@ export default {
       stock_code: "",
       cat_id: "",
       ruleForm: {
-        bidNo: "", //咨询单反馈编号
+        bidNo: "", //竞价单反馈编号
         good_num: "", //商品数量
         sale_price: "",
         sendtype: "1", // 发货方式
@@ -869,7 +869,7 @@ export default {
           const { bidNo, in_num, in_arrival_time, sale_price, remark } =
             this.sitem;
           this.ruleForm = {
-            bidNo: bidNo || "", //咨询单反馈编号
+            bidNo: bidNo || "", //竞价单反馈编号
             good_num: in_num || "0", //商品数量
             sale_price: sale_price || "",
             sendtype: "1", // 发货方式

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

@@ -51,7 +51,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="咨询截止时间" prop="endtime">
+        <el-form-item label="竞价截止时间" prop="endtime">
           <el-date-picker
             v-model="ruleForm.endtime"
             type="datetime"
@@ -59,17 +59,17 @@
             style="width: 100%"
             :disabled="type === 'view'"
             :picker-options="pickerOptions"
-            placeholder="咨询截止时间"
+            placeholder="竞价截止时间"
           >
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="咨询类型" prop="is_project">
+        <el-form-item label="竞价类型" prop="is_project">
           <el-select
             v-model="ruleForm.is_project"
             style="width: 100%"
-            placeholder="咨询类型"
+            placeholder="竞价类型"
             clearable
             :disabled="type === 'view' || type === 'edit'"
           >
@@ -116,9 +116,9 @@
         </el-form-item>
       </el-col>
       <el-col :span="8" v-show="ruleForm.is_project === '1'">
-        <el-form-item label="项目咨询截止时间" required label-width="140px">
+        <el-form-item label="项目竞价截止时间" required label-width="140px">
           <el-input
-            placeholder="项目咨询截止时间"
+            placeholder="项目竞价截止时间"
             v-model="ruleForm.pendtime"
             disabled
             maxlength="500"
@@ -647,7 +647,7 @@
                   </el-col>
                   <el-col :span="8" class="fr tr">
                     <div class="lsac">
-                      咨询单总额：{{
+                      竞价单总额：{{
                         accMul(this.ruleForm.budget_price, this.ruleForm.num)
                       }}
                       (元)
@@ -743,13 +743,13 @@ export default {
       },
       status: "", //存储详情接口返的状态
       ruleForm: {
-        is_project: "0", //咨询类型 1非项目2项目，
+        is_project: "0", //竞价类型 1非项目2项目，
         projectNo: [], //项目编号
         khNo: [], //客户编号
         khname: "", //客户名称
         companyNo: "",
-        endtime: "", //咨询截止时间
-        pendtime: "", //项目咨询截止时间
+        endtime: "", //竞价截止时间
+        pendtime: "", //项目竞价截止时间
         platform_code: "", //平台id
         puse_desc: "",
         budget_total: "",
@@ -886,12 +886,12 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           let {
-            is_project, //咨询类型 1销售2咨询，
+            is_project, //竞价类型 1销售2竞价，
             projectNo, //项目编号
             khNo, //客户编号
             khname, //客户名称
             companyNo,
-            endtime, //咨询截止时间
+            endtime, //竞价截止时间
             platform_code, //平台id
             platform_name,
             ladder,
@@ -951,12 +951,12 @@ export default {
           this.platform_name = platform_name || "";
           this.ruleForm = {
             infoNo: this.id,
-            is_project: is_project || "1", //咨询类型 1销售2咨询，
+            is_project: is_project || "1", //竞价类型 1销售2竞价，
             projectNo: projectNo ? [projectNo] : [], //项目编号
             khNo: khNo ? [khNo] : [], //客户编号
             khname: khname || "", //客户名称
             companyNo: companyNo || this.business_companyNo || "",
-            endtime: endtime || "", //咨询截止时间
+            endtime: endtime || "", //竞价截止时间
             platform_code: platform_code || "", //平台id
             puse_desc: "",
             budget_total: "",
@@ -1036,7 +1036,7 @@ export default {
             is_project === "1" &&
             new Date(endtime).getTime() > new Date(pendtime).getTime()
           ) {
-            this.$message.warning("咨询截止时间不能晚于项目咨询截止时间！");
+            this.$message.warning("竞价截止时间不能晚于项目竞价截止时间！");
             this.loading = false;
             return;
           }

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

@@ -280,7 +280,7 @@ export default {
         { id: "4", label: "等待议价结果", type: "warning" },
         { id: "5", label: "议价已结束", type: "" },
         { id: "6", label: "已选择该商品", type: "success" },
-        // 0待提交1待任务结束 2 待咨询确认 3议价待财务定价4 待主管确认5 待咨询确认定价6 咨询确认
+        // 0待提交1待任务结束 2 待竞价确认 3议价待财务定价4 待主管确认5 待竞价确认定价6 竞价确认
       ],
       loading: true,
       showModel: false,

src/views/sellOut/zixunOrder/detail.vue

@@ -57,7 +57,7 @@
         </template>
       </show-data-table>
       <el-tabs v-model="projectTabs">
-        <el-tab-pane label="新建咨询单" name="0" v-if="queryType === 'add'">
+        <el-tab-pane label="新建竞价单" name="0" v-if="queryType === 'add'">
           <add-form
             v-if="newTime !== ''"
             :newTime="newTime"
@@ -67,7 +67,7 @@
             @refresh="refresh"
           />
         </el-tab-pane>
-        <el-tab-pane label="咨询单详情" name="1" v-if="queryType !== 'add'">
+        <el-tab-pane label="竞价单详情" name="1" v-if="queryType !== 'add'">
           <edit-form
             v-if="newTime !== ''"
             :newTime="newTime"
@@ -224,7 +224,7 @@ export default {
     async changeStatus(status) {
       await this.$confirm(
         status === "7" ? `确定要停止招标任务么？` : "确定要重启招标任务么？",
-        status === "7" ? "" : "重启需要重新编辑咨询信息",
+        status === "7" ? "" : "重启需要重新编辑竞价信息",
         {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

src/views/sellOut/zixunOrder/index.vue

@@ -110,7 +110,7 @@
                     slot="prepend"
                     placeholder="关键字类型"
                   >
-                    <el-option label="咨询单编号" value="1" />
+                    <el-option label="竞价单编号" value="1" />
                     <el-option label="商品名称" value="2" />
                     <el-option label="申请人" value="3" />
                     <el-option label="申请人部门" value="4" />
@@ -174,9 +174,9 @@
             :type="scope.row.is_project === '1' ? '' : 'success'"
             >{{
               scope.row.is_project === "0"
-                ? "非项目咨询单"
+                ? "非项目竞价单"
                 : scope.row.is_project === "1"
-                ? "项目咨询单"
+                ? "项目竞价单"
                 : "--"
             }}</el-tag
           >

src/views/sellOut/zxDiffOrder/components/addForm.vue

@@ -113,11 +113,11 @@ export default {
       options: [
         {
           value: "1",
-          label: "咨询订单减工差",
+          label: "竞价订单减工差",
         },
         {
           value: "2",
-          label: "咨询订单不减工差",
+          label: "竞价订单不减工差",
         },
       ],
       is_actOptions: [

src/views/sellOut/zxDiffOrder/components/columnsForm.js

@@ -1,7 +1,7 @@
 export default [
     {
         prop: "orderCode",
-        label: "咨询订单编号",
+        label: "竞价订单编号",
         col: "8",
     },
     {

src/views/sellOut/zxDiffOrder/detail.vue

@@ -161,11 +161,11 @@ export default {
       customer_remark_options: [
         {
           value: "1",
-          label: "咨询订单减工差",
+          label: "竞价订单减工差",
         },
         {
           value: "2",
-          label: "咨询订单不减工差",
+          label: "竞价订单不减工差",
         },
       ],
       is_act_options: [

src/views/sellOut/zxDiffOrder/index.vue

@@ -51,7 +51,7 @@
                     v-model="parmValue.status"
                     filterable
                     clearable
-                    placeholder="咨询类型"
+                    placeholder="竞价类型"
                     style="width: 100%"
                     @change="
                       pageInfo.curr = 1;
@@ -194,12 +194,12 @@ export default {
         { id: "2", label: "工差单审核完成" },
       ],
       statusList: [
-        "样品咨询单",
-        "线上咨询",
+        "样品竞价单",
+        "线上竞价",
         "线上贵金属",
-        "线下咨询",
+        "线下竞价",
         "线下贵金属",
-        "赠品咨询单",
+        "赠品竞价单",
         "项目竞聘",
       ],
       loading: true,
@@ -207,10 +207,10 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        zxNo: "", // 咨询单编码
+        zxNo: "", // 竞价单编码
         khNo: "", // 客户编码
         cpName: "", //商品名称
-        status: "", //咨询类型
+        status: "", //竞价类型
         salesman: "", //申请人
         start: "",
         end: "",
@@ -320,10 +320,10 @@ export default {
       this.input = "";
       this.customerCode = [];
       this.parmValue = {
-        zxNo: "", // 咨询单编码
+        zxNo: "", // 竞价单编码
         khNo: "", // 客户编码
         cpName: "", //商品名称
-        status: "", //咨询类型
+        status: "", //竞价类型
         salesman: "", //申请人
         start: "",
         end: "",
@@ -390,7 +390,7 @@ export default {
         return;
       }
       this.loading = true;
-      this.parmValue.zxNo = this.select === "1" ? this.input : ""; //咨询类型
+      this.parmValue.zxNo = this.select === "1" ? this.input : ""; //竞价类型
       this.parmValue.salesman = this.select === "2" ? this.input : ""; //申请人
       this.parmValue.cpName = this.select === "3" ? this.input : ""; //商品名称
       const res = await asyncRequest.list(this.parmValue);