zancun

src/views/goodStore/goodsCost/columns.js

@@ -70,10 +70,10 @@ const listCol = [
     label: "品牌",
   },
   {
-    prop: "good_type",
-    label: "定制",
-    _slot_: "good_type",
-    width: "50px",
+    prop: "isonline",
+    label: "是否上线",
+    _slot_: "isonline",
+    width: "70px",
   },
   {
     prop: "status",
@@ -413,7 +413,7 @@ const rules = {
     },
   ],
 
-  
+
 
   demo_fee: [
     {

src/views/goodStore/goodsCost/index.vue

@@ -101,11 +101,11 @@
             </el-col>
             <el-col :span="4" style="width: 145px; padding: 0 0 0 10px">
               <el-select
-                v-model="parmValue.good_type"
+                v-model="parmValue.isonline"
                 filterable
                 clearable
                 :size="searchSize"
-                placeholder="是否定制"
+                placeholder="是否上线"
                 style="width: 100%"
                 @change="
                   pageInfo.curr = 1;
@@ -114,8 +114,8 @@
                 "
               >
                 <el-option
-                  v-for="item in options1"
-                  :key="'good_type' + item.id"
+                  v-for="item in isonlineoptions"
+                  :key="'isonline' + item.id"
                   :label="item.name"
                   :value="item.id"
                 />
@@ -209,13 +209,15 @@
           "
         ></el-tag>
       </template>
-      <template #good_type="{ scope }">
+      <template #isonline="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="scope.row.good_type == '0' ? 'warning' : ''"
+          :type="scope.row.is_online == '0' ? 'warning' : ''"
           v-text="
-            (options1.find((item) => item.id == scope.row.good_type) || {})
-              .name || '--'
+            (
+              isonlineoptions.find((item) => item.id == scope.row.is_online) ||
+              {}
+            ).name || '--'
           "
         ></el-tag>
       </template>
@@ -392,6 +394,10 @@ export default {
           type: "info",
         },
       ],
+      isonlineoptions: [
+        { id: "0", name: "未上线" },
+        { id: "1", name: "已上线" },
+      ],
       showModel: false,
       options1: options1,
       loading: false,
@@ -409,6 +415,7 @@ export default {
         good_type: "",
         companyNo: "",
         supplierNo: "",
+        isonline:"",
         // creater: "",
       },
       sinput: "",
@@ -459,6 +466,7 @@ export default {
         cat_id: [],
         brandid: "",
         good_type: "",
+        isonline:"",
         companyNo: "",
         supplierNo: "",
       };

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -12,7 +12,7 @@
 
           <!-- ---{{ sitem.bkcode }} -->
         </span>
-
+        <tolerance />
         <!-- v-if="
             (status === '1' || status === '2') &&
             powers.some((item) => item == '007') &&
@@ -177,12 +177,13 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import orderInTable from "./components/order-in-table";
 import ShowDataTableColumns from "./components/ShowDataTableColumns";
 import { order_type_options, statusOptions } from "./columns";
-
+import tolerance from "./components/ShowDataTableColumns";
 export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
     orderInTable,
+    tolerance,
   },
 
   computed: {

src/views/sellOut/bargainList/columns.js

@@ -230,17 +230,7 @@ const editColumns = [
     span: 6
   },
 
-  {
-    prop: "remark",
-    label: "采购备注",
-    span: 12
-  },
 
-  {
-    prop: "cost_desc",
-    label: "工艺说明",
-    span: 12
-  },
   {
     prop: "good_num",
     label: "购买数量",
@@ -263,46 +253,66 @@ const editColumns = [
     prop: "sale_price",
     label: "议价前售价",
     append: '元',
-    span: 8
+    span: 6
   },
 
   {
     prop: "cost_before_price",
     label: "议价前工艺费",
     append: '元',
-    span: 8
+    span: 6
   },
   {
     prop: "before_rate",
     label: "议价前税率",
     append: '%',
-    span: 8
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
   },
   {
     prop: "after_price",
     label: "议价后单价",
     append: '元',
-    span: 8
+    span: 6
   },
   {
     prop: "cost_after_price",
     label: "议价后工艺费",
     append: '元',
-    span: 8
+    span: 6
   },
 
   {
     prop: "after_rate",
     label: "议价后税率",
     append: '%',
-    span: 8
+    span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: "result_info",
+    label: "议价原因",
     span: 6
   },
+  {
+    prop: "remark",
+    label: "采购备注",
+    span: 24
+  },
 
+  {
+    prop: "cost_desc",
+    label: "工艺说明",
+    span: 24
+  },
+  {
+    prop: "bargain_remark",
+    label: "议价备注",
+    span: 24
+  },
 
 ]
 

src/views/sellOut/bargainList/detail.vue

@@ -29,12 +29,12 @@
                   <img
                     v-if="sitem.good_img"
                     :src="sitem.good_img"
-                    class="hover"
+                    class="fl hover"
                     v-viewer
                     style="
-                      width: 20px;
-                      height: 20px;
-                      margin: 8px 10px 0 0;
+                      width: 23px;
+                      height: 23px;
+                      margin: 0;
                       vertical-align: top;
                     "
                     alt=""