1

src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -1,4 +1,4 @@
-
+//采返 销售订单展示字段
 const reColumns = [
   {
     prop: "good_name",
@@ -25,10 +25,6 @@ const reColumns = [
     label: "单位",
     span: 4,
   },
-
-
-
-
   {
     prop: "send_way",
     label: "发货方式",
@@ -46,7 +42,6 @@ const reColumns = [
     prop: "pay_way",
     label: "付款方式",
     _slot_: "pay_way",
-
     span: 4,
   },
 
@@ -57,21 +52,53 @@ const reColumns = [
     append: 'g',
     span: 6,
   },
+
+  {
+    prop: "creater",
+    label: "反馈人",
+    span: 4,
+  },
+  {
+    prop: "addtime",
+    label: "反馈时间",
+    span: 6,
+  },
+  {
+    prop: "supply_area",
+    label: "供货区域",
+    _slot_: "supply_area",
+    span: 6,
+  },
+
+
+  {
+    prop: "good_img",
+    label: "商品图片",
+    _slot_: "good_img",
+    span: 18,
+
+  },
   {
     prop: "noble",
     _slot_: "noble",
     label: "贵金属信息",
-    span: 10,
+    span: 24,
   },
   {
     prop: "craft_desc",
     label: "工艺说明",
     span: 24,
   },
+  {
+    prop: "remark",
+    label: "采返备注",
+    span: 24,
+  },
 
 
 
 ]
+//采返 采购商品字段
 const coveColumns = [
   {
     prop: "good_name",
@@ -125,7 +152,7 @@ const coveColumns = [
     append: 'g',
     span: 6,
   },
- 
+
   {
     prop: "creater",
     label: "反馈人",
@@ -136,6 +163,28 @@ const coveColumns = [
     label: "反馈时间",
     span: 6,
   },
+  {
+    prop: "expire_day",
+    label: "竞价有效期",
+    append: '天',
+    span: 6
+  },
+  {
+    prop: "delivery_day",
+    label: "物流时间",
+    append: '天',
+    span: 6
+  },
+  {
+    prop: "work_day",
+    label: "生产工期",
+    append: '天',
+    span: 6
+  },
+
+ 
+
+
   {
     prop: "supply_area",
     label: "供货区域",
@@ -148,7 +197,7 @@ const coveColumns = [
     prop: "good_img",
     label: "商品图片",
     _slot_: "good_img",
-    span: 18,
+    span: 24,
 
   },
   {
@@ -170,6 +219,7 @@ const coveColumns = [
 
 
 ]
+//商品上线字段
 const onlineColumns = [
   {
     prop: "good_name",
@@ -467,6 +517,7 @@ const onlineColumns = [
 
 
 ]
+//商品成本字段
 const costColumns = [
   {
     prop: "good_name",
@@ -665,6 +716,21 @@ const options9 = [
   { id: "1", name: "月清" },
   { id: "2", name: "双月清" },
 ]
+//付款方式
+const options10 = [
+  { id: "0", name: "现结" },
+  { id: "1", name: "月清" },
+  { id: "2", name: "双月清" },
+]
+//发货方式
+const options11 = [
+  { id: "0", name: "公司自提" },
+  { id: "1", name: "供应商包邮" },
+]
 
-export { onlineColumns, reColumns, costColumns, coveColumns, options1, options2, options3, options4, options5, options6, options7, options8, options9 }
+const options12 = [
+  { id: "0", name: "一地" },
+  { id: "1", name: "多地" },
+]
+export { onlineColumns, reColumns, costColumns, coveColumns, options1, options2, options3, options4, options5, options6, options7, options8, options9, options10, options11, options12 }
 

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

@@ -270,7 +270,7 @@
         !iscgd
       "
       :sitem="sitem"
-      :columns="coveColumns"
+      :columns="reColumns"
       :border="border"
     >
       <template slot="good_name">
@@ -398,6 +398,16 @@
           >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
         >
       </template>
+      <template slot="supply_area">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (options6.find((item) => item.id === sitem.supply_area) || {})
+              .name || '--'
+          "
+        ></el-tag>
+      </template>
+     
       <template slot="pay_way">
         <el-tag
           :size="'mini'"
@@ -451,6 +461,9 @@ import {
   options7,
   options8,
   options9,
+  options10,
+  options11,
+  options12,
 } from "./ShowDataTableColumns";
 export default {
   name: "showGoodsDataTable",
@@ -495,6 +508,9 @@ export default {
       options7,
       options8,
       options9,
+      options10,
+      options11,
+      options12,
       onlineColumns,
       reColumns,
       costColumns,

src/views/sellOut/bargainList/columns.js

@@ -95,48 +95,12 @@ const editColumns = [
     _slot_: "status",
     span: 6
   },
-
-
- 
-
-
- 
-
-  {
-    prop: "origin_addr",
-    label: "产地",
-    span: 6
-  },
- 
-
-
-
-
   {
-    prop: "addtime",
-    label: "添加时间",
+    prop: "creater",
+    label: "创建人",
     span: 6
   },
 
-  {
-    prop: "expire_day",
-    label: "竞价有效期",
-    append: '天',
-    span: 4
-  },
-  {
-    prop: "delivery_day",
-    label: "物流时间",
-    append: '天',
-    span: 4
-  },
-  {
-    prop: "work_day",
-    label: "生产工期",
-    append: '天',
-    span: 4
-  },
-
   {
     prop: "is_addrs",
     label: "是否多地",
@@ -149,32 +113,32 @@ const editColumns = [
     _slot_: "is_custom",
     span: 4
   },
-
-
-
-
-
   {
     prop: "good_num",
     label: "购买数量",
     _slot_: "good_num",
     span: 4
   },
-  {
-    prop: "creater",
-    label: "创建人",
-    span: 4
-  },
   {
     prop: "rate_status",
-    label: "创建人",
+    label: "预计通过节点",
     _slot_: "rate_status",
-    span: 8
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "添加时间",
+    span: 6
+  },
+  {
+    prop: "origin_addr",
+    label: "产地",
+    span: 6
   },
   {
     prop: "result_info",
     label: "议价原因",
-    span: 24
+    span: 12
   },
   {
     prop: "bargain_remark",
@@ -364,7 +328,12 @@ const listCol = [
   },
 ]
 
-
+const rate_status_options = [
+  { id: '0', label: '全部无法通过' },
+  { id: '1', label: '业务主管通过' },
+  { id: '2', label: '财务主管通过' },
+  { id: '3', label: 'boss通过' },
+]
 
 export {
   listCol, options1,
@@ -382,5 +351,6 @@ export {
   editColumns,
   bargainingArr,
   costArr,
-  statusList
+  statusList,
+  rate_status_options
 }

src/views/sellOut/bargainList/detail.vue

@@ -29,13 +29,9 @@
                   ></el-tag>
                 </template>
 
-            
-           
-             
-              
                 <template slot="is_addrs">
                   <el-tag
-                    :size="tablebtnSize"
+                    :size="'mini'"
                     v-text="
                       (
                         options12.find((item) => item.id == sitem.is_addrs) ||
@@ -46,7 +42,7 @@
                 </template>
                 <template slot="is_custom">
                   <el-tag
-                    :size="tablebtnSize"
+                    :size="'mini'"
                     v-text="
                       (
                         options1.find((item) => item.id == sitem.is_custom) ||
@@ -55,20 +51,6 @@
                     "
                   ></el-tag>
                 </template>
-                <template slot="supply_area">
-                  <el-tag
-                    :size="tablebtnSize"
-                    v-text="
-                      (
-                        options6.find(
-                          (item) => item.id === sitem.supply_area
-                        ) || {}
-                      ).name || '--'
-                    "
-                  ></el-tag>
-                </template>
-            
-            
 
                 <template slot="good_num">
                   <span
@@ -76,15 +58,28 @@
                     }}{{ sitem.unit }}</span
                   >
                 </template>
+                 <template slot="rate_status">
+                   <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        rate_status_options.find((item) => item.id == sitem.rate_status+'') ||
+                        {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+                
               </show-data-table>
             </el-collapse-item>
-             <el-collapse-item title="商品信息" name="20">
+            <el-collapse-item title="商品信息" name="20">
               <show-goods-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
                 :type="'3'"
                 :skucode="''"
                 :spucode="sitem.spuCode"
+                :iscgd="true"
               />
             </el-collapse-item>
             <el-collapse-item
@@ -235,6 +230,7 @@ import {
   options11,
   options12,
   statusList,
+  rate_status_options
 } from "./columns";
 export default {
   components: {
@@ -277,8 +273,9 @@ export default {
       options11,
       options12,
       statusList,
+      rate_status_options,
       projectTabs: "1",
-      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9",'20'],
+      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "20"],
       newTime: "",
       loading: false,
       queryType: "",
@@ -322,7 +319,7 @@ export default {
       this.loading = false;
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
-      
+
         const { status, exam_info } = this.sitem;
         this.orderItem = {};
         this.moneyDirItem = {};
@@ -368,7 +365,7 @@ export default {
 
     async examFormSubmit(e, title) {
       if (!this.loading) {
-        const {state,remark}=e
+        const { state, remark } = e;
         let model = {
           bargainNo: this.queryId,
           status: state,
@@ -381,7 +378,11 @@ export default {
         })
           .then(async () => {
             const { after_price, lower_price } = this.sitem;
-            if (this.status === "7" && after_price * 1 < lower_price * 1&&state+''==='1') {
+            if (
+              this.status === "7" &&
+              after_price * 1 < lower_price * 1 &&
+              state + "" === "1"
+            ) {
               this.loading = false;
               await this.$confirm(
                 `当前商品同意议价后，售价已低于系统最低售价${this.sitem.lower_price}元！`,