Merge branch 'master' into sit

src/apis/service/purchaseIn/recovery/index.js

@@ -6,4 +6,6 @@ export default {
   list: (data, params) => http(api + "consultbidlistcopy", data, "post", params),
   // 采返商品详情
   good_detail: (data, params) => http(api + "consultfeadinfo", data, "post", params),
+  // 招标任务详情
+  info_detail: (data, params) => http(api + "consultzxinfo", data, "post", params),
 };

src/views/purchaseIn/recovery/columns.js

@@ -1,50 +1,48 @@
 const columns = [
-  {
-    prop: "zxNo",
-    label: "竞价单编号",
-    width: "158px",
-  },
+  // {
+  //   prop: "zxNo",
+  //   label: "竞价单编号",
+  //   width: "158px",
+  // },
   {
     prop: "infoNo",
-    label: "竞价阶梯编号",
-    width: "155px",
+    label: "任务单号",
+    width: "153px",
   },
 
   {
     prop: "bidNo",
-    label: "反馈单编号",
-    width: "158px",
+    label: "反馈商品编号",
+    width: "153px",
   },
-  
+
   {
     prop: "good_name",
     label: "商品名称",
     _slot_: "good_name",
-    'min-width': "220px",
+    "min-width": "220px",
   },
   {
     prop: "can",
     label: "分类",
     _slot_: "can",
-    'min-width': "180px",
+    "width": "180px",
   },
 
-
   {
     prop: "brand_name",
     label: "品牌",
     width: "80px",
   },
 
-
   {
     prop: "unit",
     label: "单位",
-    width: "60px",
+    width: "50px",
   },
   {
-    prop: "company_name",
-    label: "采购员部门",
+    prop: "supplierName",
+    label: "供应商名称",
     minWidth: "150px",
   },
   {
@@ -65,7 +63,7 @@ const columns = [
     width: "50px",
     _slot_: "operation",
   },
-]
+];
 const statusOptions = [
   { value: "0", label: "待与供应商确认" },
   { value: "1", label: "待入库" },
@@ -78,38 +76,38 @@ const statusOptions = [
 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: "待完善成本" },
@@ -120,13 +118,13 @@ const options8 = [
   { id: "6", name: "上线成功" },
   { id: "7", name: "审核失败" },
   { id: "8", name: "已下线" },
-]
+];
 
 const options9 = [
   { id: "0", name: "现结" },
   { id: "1", name: "月清" },
   { id: "2", name: "双月清" },
-]
+];
 const costColumns = [
   {
     prop: "good_name",
@@ -155,7 +153,7 @@ const costColumns = [
   {
     prop: "tax",
     label: "税点",
-    append: '%',
+    append: "%",
     span: 6,
   },
   {
@@ -171,19 +169,19 @@ const costColumns = [
   {
     prop: "expire_day",
     label: "有效期",
-    append: '天',
+    append: "天",
     span: 5,
   },
   {
     prop: "delivery_day",
     label: "物流时间",
-    append: '天',
+    append: "天",
     span: 5,
   },
   {
     prop: "work_day",
     label: "生产工期",
-    append: '天',
+    append: "天",
     span: 5,
   },
   {
@@ -208,14 +206,10 @@ const costColumns = [
     span: 6,
   },
 
-
- 
-
-
   {
     prop: "weight",
     label: "商品总克重",
-    append: 'g',
+    append: "g",
     span: 6,
   },
 
@@ -225,7 +219,6 @@ const costColumns = [
     _slot_: "supply_area",
     span: 6,
   },
- 
 
   {
     prop: "send_way",
@@ -236,79 +229,68 @@ const costColumns = [
   {
     prop: "total_fee",
     label: "成本合计",
-    append: '元',
+    append: "元",
     span: 6,
   },
   {
     prop: "cert_fee",
     label: "证书费",
-    append: '元',
+    append: "元",
     span: 6,
   },
   {
     prop: "pakge_fee",
     label: "包装费",
-    append: '元',
+    append: "元",
     span: 6,
   },
 
   {
     prop: "cost_fee",
     label: "工艺费",
-    append: '元',
+    append: "元",
     span: 6,
   },
 
   {
     prop: "mark_fee",
     label: "加标费",
-    append: '元',
+    append: "元",
     span: 6,
   },
 
   {
     prop: "demo_fee",
     label: "打样费",
-    append: '元',
+    append: "元",
     span: 6,
   },
 
   {
     prop: "open_fee",
     label: "开模费",
-    append: '元',
+    append: "元",
     span: 6,
   },
 
   {
     prop: "delivery_fee",
     label: "物流费",
-    append: '元',
+    append: "元",
     span: 6,
   },
   {
     prop: "nake_fee",
     label: "裸价",
-    append: '元',
+    append: "元",
     span: 6,
   },
 
-
-
-
-
-
-  {
-    prop: "stock_moq",
-    label: "备库起订量",
-    span: 4,
-  },
-  {
-    prop: "noble",
-    _slot_: "noble",
-    label: "贵金属信息",
-    span: 20,
-  },
+  // {
+  //   prop: "stock_moq",
+  //   label: "备库起订量",
+  //   span: 4,
+  // },
 
   {
     prop: "remark",
@@ -324,13 +306,81 @@ const costColumns = [
     prop: "good_img",
     _slot_: "good_img",
     label: "商品图片",
-    span: 24,
+    span: 12,
+  },
+  {
+    prop: "noble",
+    _slot_: "noble",
+    label: "贵金属信息",
+    span: 12,
+  },
+];
+const infoColumns = [
+  {
+    prop: "infoNo",
+    label: "竞价单编号",
+    span: 6,
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    span: 6,
   },
 
+  {
+    prop: "is_addrs",
+    label: "是否多地",
+    _slot_: "is_addrs",
+    span: 6,
+  },
+  {
+    prop: "num",
+    label: "数量",
+    span: 6,
+  },
+  {
+    prop: "company",
+    label: "销售方公司",
+    _slot_: "company",
+  },
+  {
+    prop: "khName",
+    label: "购买方公司",
+    _slot_: "khName",
+  },
 
 
+];
+const is_addrs_options= [
+  { value: "0", label: "一地" },
+  { value: "1", label: "多地" },
+];
 
-
-]
-
-export { columns, statusOptions,  options1, options2, options3, options4, options5, options6, options7, options8, options9, costColumns }
+const options0= [
+  { id: "0", label: "待发布竞标" },
+  { id: "1", label: "招标进行中" },
+  { id: "2", label: "招标已结束" },
+  { id: "3", label: "待选择商品" },
+  { id: "4", label: "已选商品待下单" },
+  { id: "5", label: "已成功转单" },
+  { id: "6", label: "已取消转单" },
+  { id: "7", label: "招标已暂停" },
+];
+export {
+  columns,
+  statusOptions,
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  options9,
+  costColumns,
+  infoColumns,
+  is_addrs_options,
+  options0
+};

src/views/purchaseIn/recovery/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="recovery pagePadding">
-    <div
-      v-if=" powers.some((i) => i == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -25,11 +23,11 @@
       >
         <template #table-header="{}">
           <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
+            <el-row style="padding: 0 0 10px 80px">
               <el-col :span="6" style="width: 200px">
                 <el-input
                   clearable
-                  placeholder="竞价单编号"
+                  placeholder="任务单号"
                   v-model="parmValue.infoNo"
                   maxlength="40"
                   :size="searchSize"
@@ -41,11 +39,11 @@
                 >
                 </el-input>
               </el-col>
-              <el-col :span="6" style="width: 200px; padding: 0 0 0 10px">
+              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
                 <el-input
                   clearable
-                  placeholder="反馈编号"
-                  v-model="parmValue.bidNo"
+                  placeholder="商品名称"
+                  v-model="parmValue.good_name"
                   maxlength="40"
                   :size="searchSize"
                   @blur="
@@ -56,7 +54,7 @@
                 >
                 </el-input>
               </el-col>
-               <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
+              <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   placeholder="采购员部门"
@@ -70,7 +68,7 @@
                   "
                 >
                 </el-input>
-              </el-col>
+              </el-col> -->
 
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -82,6 +80,53 @@
                   重置
                 </el-button>
               </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6" style="width: 280px">
+                <el-input
+                  clearable
+                  placeholder="反馈商品编号"
+                  v-model="parmValue.bidNo"
+                  maxlength="40"
+                  :size="searchSize"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                </el-input>
+              </el-col>
+              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+                <el-input
+                  clearable
+                  placeholder="供应商名称"
+                  v-model="parmValue.supplierName"
+                  maxlength="40"
+                  :size="searchSize"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                </el-input>
+              </el-col>
+              <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
+                <el-input
+                  clearable
+                  placeholder="采购员部门"
+                  v-model="parmValue.company_name"
+                  maxlength="40"
+                  :size="searchSize"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                </el-input>
+              </el-col> -->
 
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
@@ -120,13 +165,17 @@
           <el-tooltip effect="dark" content="详情" placement="top">
             <i
               class="el-icon-view tb-icon"
-              @click="(modelId = scope.row.bidNo), (showModel = true)"
+              @click="
+                (modelId = scope.row.bidNo), (infoNo = scope.row.infoNo);
+                showModel = true;
+              "
             ></i>
           </el-tooltip>
         </template>
       </ex-table>
       <show-data
         :showModel="showModel"
+        :infoNo="infoNo"
         :bidNo="modelId"
         @cancel="showModel = false"
       />
@@ -136,7 +185,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/recovery";
@@ -153,9 +202,7 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "recovery"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "recovery") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
@@ -167,12 +214,14 @@ export default {
       showModel: false,
       isDetail: false,
       modelId: 0,
-
+      infoNo: 0,
       parmValue: {
         infoNo: "",
         bidNo: "",
         is_own: "1",
-        company_name:"", //部门
+        company_name: "", //部门
+        supplierName: "",
+        good_name: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -205,7 +254,9 @@ export default {
         infoNo: "",
         bidNo: "",
         is_own: "1",
-        company_name:"", //部门
+        company_name: "", //部门
+        supplierName: "",
+        good_name: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -235,9 +286,8 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .recovery {
   // text-align: right;
 }
 </style>
-   

src/views/purchaseIn/recovery/showData.vue

@@ -16,6 +16,53 @@
   >
     <show-data-table
       style="margin: -20px 0 0 0"
+      v-if="infoSitem && infoSitem.id"
+      :sitem="infoSitem"
+      :columns="infoColumns"
+    >
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (options0.find((item) => item.id == infoSitem.status) || {}).label || '--'
+          "
+        ></el-tag>
+      </template>
+
+      <template slot="company">
+        <span>{{ infoSitem.company }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>销售方公司编号：</span><span>{{ infoSitem.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="khName">
+        <span>{{ infoSitem.khname }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>购买方公司编号：</span><span>{{ infoSitem.khNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="is_addrs">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (is_addrs_options.find((item) => item.value == infoSitem.is_addrs) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+    </show-data-table>
+    <show-data-table
+      v-if="sitem && sitem.id"
       :sitem="sitem"
       :columns="costColumns"
       :border="true"
@@ -61,8 +108,7 @@
         <el-tag
           :size="'mini'"
           v-text="
-            (options1.find((item) => item.id == sitem.good_type) || {}).name ||
-            '--'
+            (options1.find((item) => item.id == sitem.good_type) || {}).name || '--'
           "
         />
         <span v-if="sitem.good_type === '1'" style="padding: 0 0 0 5px"
@@ -72,31 +118,25 @@
       <template slot="pay_way">
         <el-tag
           :size="'mini'"
-          v-text="
-            (options9.find((item) => item.id == sitem.pay_way) || {}).name ||
-            '--'
-          "
+          v-text="(options9.find((item) => item.id == sitem.pay_way) || {}).name || '--'"
         />
       </template>
       <template slot="supply_area">
         <el-tag
           :size="'mini'"
           v-text="
-            (options6.find((item) => item.id == sitem.supply_area) || {})
-              .name || '--'
+            (options6.find((item) => item.id == sitem.supply_area) || {}).name || '--'
           "
         />
       </template>
 
       <template slot="noble">
         <span v-if="sitem.noble_name"
-          >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-            sitem.noble_name
-          }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-            sitem.is_gold_price === "0" ? "不" : ""
-          }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
-            sitem.config
-          }}-{{ sitem.other_config }}</span
+          >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{ sitem.noble_name }}-{{
+            sitem.gold_price ? sitem.gold_price : "0"
+          }}元/g-{{ sitem.is_gold_price === "0" ? "不" : "" }}启用实时金价-{{
+            sitem.is_diff === "1" ? "有" : "无"
+          }}工差-{{ sitem.config }}-{{ sitem.other_config }}</span
         >
         <span v-else>--</span>
       </template>
@@ -127,19 +167,23 @@ import {
   options8,
   options9,
   costColumns,
+  infoColumns,
+  is_addrs_options,
+  options0,
 } from "./columns";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/recovery";
 export default {
   name: "showData",
-  props: ["showModel", "bidNo"],
+  props: ["showModel", "bidNo", "infoNo"],
   mixins: [resToken],
   data() {
     return {
       newTime: "",
       loading: true,
       showModelThis: this.showModel,
-      sitem: "",
+      sitem: null,
+      infoSitem: null,
       options1,
       options2,
       options3,
@@ -150,13 +194,16 @@ export default {
       options8,
       options9,
       costColumns,
+      infoColumns,
+      is_addrs_options,
+      options0,
     };
   },
   watch: {
     showModel: function (val) {
       this.showModelThis = val;
       if (val) {
-        this.initData();
+        this.initInfoData();
       }
     },
     showModelThis(val) {
@@ -167,6 +214,24 @@ export default {
   },
 
   methods: {
+    async initInfoData() {
+      this.loading = true;
+      const { code, message, data } = await asyncRequest.info_detail({
+        infoNo: this.infoNo,
+      });
+      if (code === 0) {
+        this.infoSitem = data;
+        console.log(this.infoSitem);
+        await this.initData();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+        this.loading = false;
+      }
+    },
+    //
+
     async initData() {
       this.loading = true;
       const { code, message, data } = await asyncRequest.good_detail({
@@ -174,23 +239,16 @@ export default {
       });
       if (code === 0) {
         this.sitem = data;
-        // const { good_img } = this.sitem;
-        // if (good_img) {
-        //   this.sitem.good_img = good_img.split(",");
-        // } else {
-        //   this.sitem.good_img = [];
-        // }
-
         this.loading = false;
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
         this.$message.warning(message);
+        this.loading = false;
       }
     },
   },
 };
 </script>
 
-<style>
-</style>
+<style></style>