暂存

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

@@ -10,7 +10,8 @@ export default {
   status: (data, params) => http(api + "bargainstatus", data, "post", params),
   // 分页查询 反馈列表
   feedList: (data, params) => http(api + "consultbidlist", data, "post", params),
-
+ // 分页查询
+ list: (data, params) => http(api + "bargainlist", data, "post", params),
 
 
   // 添加
@@ -20,8 +21,7 @@ export default {
 
   // 删除
   delete: (data, params) => http(api + "delete", data, "post", params),
-  // 分页查询
-  list: (data, params) => http(api + "consultlists", data, "post", params),
+ 
   // 项目详情
   pdetail: (data, params) => http(api + "projectinfo", data, "post", params),
   // 议价单创建

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

@@ -2,18 +2,23 @@
   <div class="show-data-table">
     <el-row class="purchaseOrderDetail-addForm">
       <template v-for="(colu, index) in columns">
-      <el-col
-        :span="colu.span || 12"
-        class="purchaseOrderDetail-addForm-el-col"
-        v-if="colu._slot_||colu.showProp&&sitem[colu.prop]||!colu.showProp"
-        :key="colu + index"
-      >
-        <div class="label">{{ colu.label }}：</div>
-        <div class="name" v-if="colu._slot_">
-          <slot :name="colu._slot_" :slotName="colu._slot_"></slot>
-        </div>
-        <div class="name" v-else>{{ sitem[colu.prop] }}</div>
-      </el-col>
+        <el-col
+          :span="colu.span || 12"
+          class="purchaseOrderDetail-addForm-el-col"
+          v-if="
+            colu._slot_ || (colu.showProp && sitem[colu.prop]) || !colu.showProp
+          "
+          :key="colu + index"
+        >
+          <div class="label">{{ colu.label }}：</div>
+          <div class="name" v-if="colu._slot_">
+            <slot :name="colu._slot_" :slotName="colu._slot_"></slot>
+          </div>
+          <div class="name" v-else>
+            <span>{{ sitem[colu.prop] }}</span>
+            <span v-if="colu.append">{{ colu.append }}</span>
+          </div>
+        </el-col>
       </template>
     </el-row>
   </div>
@@ -101,7 +106,7 @@ export default {
         font-size: 12px !important;
         border-bottom: 1px solid #ebeef5 !important;
         padding: 0 0 0 10px !important;
-        word-break: break-all!important;
+        word-break: break-all !important;
         color: #606266 !important;
       }
     }

src/views/sellOut/bargainList/columns.js

@@ -460,21 +460,21 @@ const feedbackListCol = [
     _slot_: "status",
     width: "120px",
   },
-  {
-    prop: "expire_day",
-    label: "信息有效期",
-    "width": "85"
-  },
-  {
-    prop: "delivery_day",
-    label: "物流时间",
-    "width": "85"
-  },
-  {
-    prop: "work_day",
-    label: "生产工期",
-    "width": "85"
-  },
+  // {
+  //   prop: "expire_day",
+  //   label: "信息有效期",
+  //   "width": "85"
+  // },
+  // {
+  //   prop: "delivery_day",
+  //   label: "物流时间",
+  //   "width": "85"
+  // },
+  // {
+  //   prop: "work_day",
+  //   label: "生产工期",
+  //   "width": "85"
+  // },
 
 
   {
@@ -494,19 +494,15 @@ const feedbackListCol = [
 
 const listCol = [
   {
-    prop: "zxNo",
-    label: "咨询编号",
+    prop: "bargainNo",
+    label: "议价编号",
     width: "160"
   },
   {
-    prop: "creater",
-    label: "申请人",
-    width: "60"
-  },
-  {
-    prop: "good_name",
-    label: "商品名称",
-    "width": "100"
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
   },
   {
     prop: "good_img",
@@ -515,32 +511,39 @@ const listCol = [
     "width": "50"
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: "good_name",
+    label: "商品名称",
+    "min-width": "150"
   },
 
+
   {
-    prop: "khNo",
-    label: "客户编号",
-    "width": "125"
-  },
-  {
-    prop: "khname",
-    label: "客户名称",
-    "width": "135"
+    prop: "specinfo",
+    label: "规格",
+    _slot_: "specinfo",
+    "min-width": "125"
   },
 
   {
-    prop: "except_code",
-    label: "预算单价",
-    _slot_: "except_code",
-    width: 110,
-
+    prop: "can",
+    label: "分类",
+    _slot_: "can",
+    "min-width": "125"
   },
 
+  // {
+  //   prop: "except_code",
+  //   label: "预算单价",
+  //   _slot_: "except_code",
+  //   width: 110,
+
+  // },
 
+  {
+    prop: "creater",
+    label: "申请人",
+    "width": "75"
+  },
 
   {
     prop: "addtime",

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

@@ -1,73 +1,295 @@
-const addColumns = [
+
+//是否定制
+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 options10 = [
+  { id: "0", name: "现结" },
+  { id: "1", name: "月清" },
+  { id: "2", name: "双月清" },
+]
+//发货方式
+const options11 = [
+  { id: "0", name: "公司自提" },
+  { id: "1", name: "供应商包邮" },
+]
+
+const editColumns = [
   {
-    prop: "total_weight",
-    label: "总重量(g)",
+    prop: "bargainNo",
+    label: "议价单编号",
     span: 6
   },
   {
-    prop: "unit_name",
-    label: "单位",
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "creater",
+    label: "创建人",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "bidsNo",
+    label: "反馈商品编号",
     span: 6
   },
 
   {
     prop: "brand_name",
     label: "品牌",
-    span: 12
+    span: 6
   },
 
   {
-    prop: "cost_desc",
-    label: "工艺说明",
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+    span: 12
+  },
+  {
+    prop: "can",
+    label: "商品分类",
+    _slot_: "can",
+    span: 12
+  },
+  {
+    prop: "specinfo",
+    label: "商品规格",
+    _slot_: "specinfo",
     span: 12
   },
   {
-    prop: "use_desc",
-    label: "产品用途",
+    prop: "origin_place",
+    label: "产地",
     span: 12
   },
+
+  {
+    prop: "expire_day",
+    label: "咨询有效期",
+    append: '天',
+    span: 6
+  },
+  {
+    prop: "delivery_day",
+    label: "物流时间",
+    append: '天',
+    span: 6
+  },
+  {
+    prop: "work_day",
+    label: "生产工期",
+    append: '天',
+    span: 6
+  },
+  {
+    prop: "tax",
+    label: "税点",
+    append: '%',
+    span: 6
+  },
+  {
+    prop: "is_addrs",
+    label: "是否多地",
+    _slot_: "is_addrs",
+    span: 6
+  },
+  {
+    prop: "is_custom",
+    label: "是否定制",
+    _slot_: "is_custom",
+    span: 6
+  },
+
+
+  {
+    prop: "weight",
+    label: "商品重量",
+    append: 'g',
+    span: 6
+  },
+
+  {
+    prop: "supply_area",
+    label: "供货区域",
+    _slot_: "supply_area",
+    span: 6
+  },
+  {
+    prop: "pay_way",
+    label: "付款方式",
+    _slot_: "pay_way",
+    span: 6
+  },
+  {
+    prop: "send_way",
+    label: "发货方式",
+    _slot_: "send_way",
+    span: 6
+  },
+  {
+    prop: "cert_fee",
+    label: "成本证书费",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "pakge_fee",
+    label: "成本包装费",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "cost_fee",
+    label: "成本工艺费",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "mark_fee",
+    label: "成本加标费",
+    append: '元',
+    span: 6
+  },
+
+  {
+    prop: "demo_fee",
+    label: "成本打样费",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "open_fee",
+    label: "成本开模费",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "delivery_fee",
+    label: "成本物流费",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "nake_fee",
+    label: "成本裸价",
+    append: '元',
+    span: 6
+  },
+
   {
     prop: "remark",
-    label: "商品备注",
+    label: "采购备注",
     span: 12
   },
+
   {
     prop: "cost_desc",
     label: "工艺说明",
     span: 12
   },
   {
-    prop: "noble_type",
+    prop: "metal_id",
     label: "贵金属信息",
-    _slot_: "noble_type",
     span: 24
   },
-]
 
-const editColumns = [
+
+
+
+
   {
-    prop: "infoNo",
-    label: "咨询单编号",
+    prop: "good_num",
+    label: "购买数量",
+    _slot_: "good_num",
     span: 6
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    span: 5
+    prop: "sale_price",
+    label: "议价前售价",
+    append: '元',
+    span: 6
   },
 
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: "cost_before_price",
+    label: "议价前工艺费",
+    append: '元',
     span: 6
   },
   {
-    prop: "departinfo",
-    label: "创建人",
-    _slot_: "departinfo",
-    span: 7
+    prop: "cost_after_price",
+    label: "议价后工艺费",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "before_rate",
+    label: "议价前税率",
+    append: '%',
+    span: 6
   },
+  {
+    prop: "after_rate",
+    label: "议价后税率",
+    append: '%',
+    span: 6
+  },
+  {
+    prop: "after_price",
+    label: "议价后单价",
+    append: '元',
+    span: 6
+  },
+
 ]
 
 
@@ -77,7 +299,7 @@ const editColumns = [
 
 
 export {
-  addColumns,
+  options1, options2, options3, options4, options5, options6, options7, options8, options9, options10, options11,
   editColumns
 }
 

src/views/sellOut/bargainList/detail.vue

@@ -7,9 +7,9 @@
       <el-tabs v-model="projectTabs">
         <el-tab-pane label="议价单详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item :title="''" name="0">
+            <el-collapse-item :title="'议价详情'" name="1">
               <show-data-table
-                style="padding: 10px 0 5px 0"
+                style="padding: -5px 0 10px 0"
                 :newTime="newTime"
                 v-if="newTime !== '' && queryType === 'view'"
                 :sitem="sitem"
@@ -25,17 +25,48 @@
                   ></el-tag>
                 </template>
 
-                <template slot="departinfo">
-                  <span>{{ sitem.salesman }}--</span>
-                  <span v-for="(si, sii) in sitem.departinfo" :key="si + sii"
-                    ><span v-if="sii !== 0">/</span>{{ si.name }}</span
+                <template slot="good_name">
+                  <img
+                    v-if="sitem.good_img"
+                    :src="sitem.good_img"
+                    class="hover"
+                    v-viewer
+                    style="
+                      width: 20px;
+                      height: 20px;
+                      margin: 8px 10px 0 0;
+                      vertical-align: top;
+                    "
+                    alt=""
+                  />
+                  <span style="vertical-align: top">{{ sitem.good_name }}</span>
+                </template>
+                <template slot="specinfo">
+                  <span
+                    v-for="(si, sii) in sitem.specinfo"
+                    :key="si.specid + sii"
+                  >
+                    <span v-if="sii !== 0">--</span>{{ si.spec_name }}[{{
+                      si.spec_value_name
+                    }}]</span
+                  >
+                </template>
+                <template slot="can">
+                  <span v-for="(si, sii) in sitem.can" :key="si.id + sii">
+                    <span v-if="sii !== 0">_</span>{{ si.name }}</span
+                  >
+                </template>
+                <template slot="good_num">
+                  <span
+                    >{{ sitem.good_num ? sitem.good_num : "0"
+                    }}{{ sitem.unit }}</span
                   >
                 </template>
               </show-data-table>
             </el-collapse-item>
             <el-collapse-item
               title="业务部门审批"
-              name="1"
+              name="2"
               v-if="status == '0' && powers.some((item) => item == '056')"
             >
               <exam-form
@@ -48,7 +79,7 @@
             </el-collapse-item>
             <el-collapse-item
               title="财务专员审批"
-              name="1"
+              name="3"
               v-if="status == '0' && powers.some((item) => item == '056')"
             >
               <exam-form
@@ -61,7 +92,7 @@
             </el-collapse-item>
             <el-collapse-item
               title="财务主管审批"
-              name="1"
+              name="4"
               v-if="status == '0' && powers.some((item) => item == '056')"
             >
               <exam-form
@@ -89,7 +120,20 @@ import { mapGetters } from "vuex";
 import addForm from "./components/addEditForm";
 import editForm from "./components/editForm";
 import feedbackList from "./components/feedbackList";
-import { editColumns } from "./components/ShowDataTableColumns";
+import {
+  editColumns,
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  options9,
+  options10,
+  options11,
+} from "./components/ShowDataTableColumns";
 export default {
   name: "bargainListDetail",
   mixins: [resToken],
@@ -119,7 +163,7 @@ export default {
       size: "small",
       editColumns: editColumns,
       projectTabs: "1",
-      projectNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
       newTime: "",
       loading: false,
       queryType: "",
@@ -127,14 +171,13 @@ export default {
       status: "",
       sitem: null,
       options: [
-        { id: "0", label: "待发布竞标" },
-        { id: "1", label: "招标进行中" },
-        { id: "2", label: "招标已结束" },
-        { id: "3", label: "等待议价结果" },
-        { id: "4", label: "待选择商品" },
-        { id: "5", label: "已成功转单" },
-        { id: "6", label: "已取消转单" },
-        { id: "7", label: "招标已暂停" },
+        { id: "1", label: "待主管审批" },
+        { id: "2", label: "待财务专员审批" },
+        { id: "3", label: "待财务主管审批" },
+        { id: "4", label: "审批通过" },
+        { id: "5", label: "主管驳回" },
+        { id: "6", label: "财务主管驳回" },
+        { id: "7", label: "已取消议价" },
       ],
     };
   },
@@ -146,15 +189,9 @@ export default {
       const { id, type } = this.$route.query;
       this.queryId = id;
       this.queryType = type;
-      this.projectTabs = type === "add" ? "0" : "1";
+      this.projectTabs = "1";
       this.loading = true;
-      if (this.queryType === "add") {
-        this.sitem = {};
-        this.getNewTime();
-      } else {
-        await this.initData();
-      }
-
+      await this.initData();
       this.loading = false;
     },
 
@@ -167,22 +204,21 @@ export default {
     async initData() {
       this.loading = true;
       const { code, message, data } = await asyncRequest.detail({
-        infoNo: this.queryId,
+        bargainNo: this.queryId,
       });
       this.loading = false;
-      console.log(data);
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
         const { status, can } = this.sitem;
-        if (can && can.length > 0) {
-          let cat_id = [];
-          can.forEach((e) => {
-            cat_id.push(e.id);
-          });
-          this.sitem.cat_id = cat_id;
-        } else {
-          this.sitem.cat_id = [];
-        }
+        // if (can && can.length > 0) {
+        //   let cat_id = [];
+        //   can.forEach((e) => {
+        //     cat_id.push(e.id);
+        //   });
+        //   this.sitem.cat_id = cat_id;
+        // } else {
+        //   this.sitem.cat_id = [];
+        // }
 
         this.status = status;
         this.getNewTime();

src/views/sellOut/bargainList/index.vue

@@ -39,7 +39,7 @@
                   "
                 >
                   <el-option
-                    v-for="item in expectOptions"
+                    v-for="item in options"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -47,58 +47,7 @@
                   </el-option>
                 </el-select>
               </el-col>
-              <el-col :span="4" style="width: 155px; padding-left: 10px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  clearable
-                  placeholder="售后申请状态"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in serviceOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="4" style="width: 380px; padding: 0px 0 0 10px">
-                <search-customer
-                  :value="customerCode"
-                  :size="searchSize"
-                  :placeholder="'企业客户'"
-                  @searchChange="customerChange"
-                />
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              <el-col :span="4" class="fr" style="width: 66px">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
-            </el-row>
-            <el-row style="padding-top: 10px">
-              <el-col :span="4" style="width: 291px">
+              <el-col :span="4" style="width: 301px; padding: 0 0 0 10px">
                 <period-date-picker
                   :start="parmValue.start"
                   :end="parmValue.end"
@@ -127,12 +76,9 @@
                     slot="prepend"
                     placeholder="请选择"
                   >
-                    <el-option label="售后申请编号" value="1" />
-                    <el-option label="销售订单编号" value="2" />
-                    <el-option label="销售出库单编号" value="3" />
-                    <el-option label="商品编号" value="4" />
-                    <el-option label="商品名称" value="5" />
-                    <el-option label="申请人" value="6" />
+                    <el-option label="议价编号" value="1" />
+                    <el-option label="反馈商品编号" value="2" />
+                    <el-option label="咨询编号" value="3" />
                   </el-select>
                   <el-button
                     slot="append"
@@ -146,21 +92,24 @@
                 </el-input>
               </el-col>
 
-              <el-col
-                :span="3"
-                class="fr"
-                style="width: 66px; padding: 0 0 0 10px"
-                v-if="powers.some((item) => item == '003')"
-              >
+              <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   :size="searchSize"
-                  type="success"
-                  style="float: right"
-                  @click="
-                    routeGoto('bargainListDetail', { id: 'add', type: 'add' })
-                  "
+                  type="primary"
+                  style="float: right; margin-left: 5px"
+                  @click="searchList"
                 >
-                  添加
+                  刷新
+                </el-button>
+              </el-col>
+              <el-col :span="4" class="fr" style="width: 66px">
+                <el-button
+                  type="warning"
+                  class="fr"
+                  :size="searchSize"
+                  @click="restSearch"
+                >
+                  重置
                 </el-button>
               </el-col>
             </el-row>
@@ -185,34 +134,16 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
+              ( options.find((item) => item.id == scope.row.status) || {})
                 .label || '--'
             "
           ></el-tag>
         </template>
-        <!-- 费用承担方 -->
-        <template #post_own="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (
-                post_ownOptions.find((item) => item.id == scope.row.post_own) ||
-                {}
-              ).label || '--'
-            "
-          ></el-tag>
+          <template #specinfo="{ scope }">
+       <span v-for="(si,sii) in  scope.row.specinfo" :key="si.spec_value_id+sii"> <span v-if="sii!==0">--</span>{{si.spec_name}}[{{si.spec_value_name}}]</span>
         </template>
-        <!-- 期望意愿 -->
-        <template #except_code="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (options.find((item) => item.id == scope.row.except_code) || {})
-                .label || '--'
-            "
-          ></el-tag>
+          <template #can="{ scope }">
+       <span v-for="(si,sii) in  scope.row.can" :key="si.id+sii"> <span v-if="sii!==0">_</span>{{si.name}}</span>
         </template>
         <template #operation="{ scope }">
           <el-tooltip
@@ -225,7 +156,7 @@
               class="el-icon-view tb-icon"
               @click="
                 routeGoto('bargainListDetail', {
-                  id: scope.row.infoNo,
+                  id: scope.row.bargainNo,
                   type: 'view',
                 })
               "
@@ -348,20 +279,7 @@ export default {
         },
       ],
       serviceValue: "", //售后申请处理状态
-      expectOptions: [
-        {
-          value: "1",
-          label: "退货",
-        },
-        {
-          value: "2",
-          label: "换货",
-        },
-        {
-          value: "3",
-          label: "改变售价",
-        },
-      ],
+
       expectValue: "", //期望意愿
       resultOptions: [
         {

src/views/sellOut/zixunOrder/columns.js

@@ -494,7 +494,7 @@ const feedbackListCol = [
 
 const listCol = [
   {
-    prop: "zxNo",
+    prop: "infoNo",
     label: "咨询编号",
     width: "160"
   },