xiaodai2022 2 years ago
parent
commit
360760134a

+ 2 - 0
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),
 };

+ 1 - 1
src/views/purchaseIn/recovery/columns.js

@@ -12,7 +12,7 @@ const columns = [
 
   {
     prop: "bidNo",
-    label: "反馈编号",
+    label: "反馈商品编号",
     width: "158px",
   },
   

+ 15 - 16
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"
@@ -29,7 +27,7 @@
               <el-col :span="6" style="width: 200px">
                 <el-input
                   clearable
-                  placeholder="竞价单编号"
+                  placeholder="任务单号"
                   v-model="parmValue.infoNo"
                   maxlength="40"
                   :size="searchSize"
@@ -44,7 +42,7 @@
               <el-col :span="6" style="width: 200px; padding: 0 0 0 10px">
                 <el-input
                   clearable
-                  placeholder="反馈编号"
+                  placeholder="反馈商品编号"
                   v-model="parmValue.bidNo"
                   maxlength="40"
                   :size="searchSize"
@@ -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="采购员部门"
@@ -120,13 +118,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 +138,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 +155,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 +167,12 @@ export default {
       showModel: false,
       isDetail: false,
       modelId: 0,
-
+      infoNo: 0,
       parmValue: {
         infoNo: "",
         bidNo: "",
         is_own: "1",
-        company_name:"", //部门
+        company_name: "", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -205,7 +205,7 @@ export default {
         infoNo: "",
         bidNo: "",
         is_own: "1",
-        company_name:"", //部门
+        company_name: "", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -235,9 +235,8 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .recovery {
   // text-align: right;
 }
 </style>
-   

+ 30 - 20
src/views/purchaseIn/recovery/showData.vue

@@ -61,8 +61,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 +71,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>
@@ -132,14 +125,15 @@ 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,
@@ -156,7 +150,7 @@ export default {
     showModel: function (val) {
       this.showModelThis = val;
       if (val) {
-        this.initData();
+        this.initInfoData();
       }
     },
     showModelThis(val) {
@@ -167,6 +161,23 @@ 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;
+        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({
@@ -192,5 +203,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>