build

src/views/sellOut/zixunOrder/components/buyGoodModal.vue

@@ -663,6 +663,7 @@ export default {
         remark: "", //订单备注
         platform_order: "", //平台订单号
         workNo: "", //其他单号
+        companyNo: "",
       },
       rulesThis: this.rules,
       rules: {
@@ -680,6 +681,13 @@ export default {
             trigger: "blur",
           },
         ],
+        companyNo: [
+          {
+            required: true,
+            message: "请选择业务公司",
+            trigger: "change",
+          },
+        ],
         sendtype: [
           {
             required: true,
@@ -796,10 +804,8 @@ export default {
 
     //销售方公司选择
     company_idsearchChange(e) {
-      if (e) {
-        const { id, code, label } = e;
-        this.ruleForm.companyNo = code || "";
-      }
+      const { code } = e;
+      this.ruleForm.companyNo = code || "";
       this.$refs.ruleForm.validateField("companyNo");
     },
 
@@ -850,7 +856,15 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { bidNo, in_num, in_arrival_time, sale_price, remark } = this.sitem;
+          const {
+            bidNo,
+            in_num,
+            in_arrival_time,
+            sale_price,
+            remark,
+            in_companyNo,
+          } = this.sitem;
+          console.log(this.sitem);
           this.ruleForm = {
             bidNo: bidNo || "", //竞价单反馈编号
             good_num: in_num || "0", //商品数量
@@ -860,6 +874,7 @@ export default {
             remark: "",
             proof_type: "1", // 通过or驳回
             proof_url: "", //驳回至
+            companyNo: in_companyNo || "",
           };
         }
 

src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -38,20 +38,17 @@
         <el-tag
           :size="tablebtnSize"
           :type="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .type || ''
+            (statusOptions.find((item) => item.id == scope.row.status) || {}).type || ''
           "
           v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .label || '--'
+            (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+            '--'
           "
         ></el-tag>
       </template>
       <template #specinfo="{ scope }">
         <span v-for="(si, sii) in scope.row.specinfo" :key="si.specid + sii">
-          <span v-if="sii !== 0"></span>{{ si.spec_name }}[{{
-            si.spec_value_name
-          }}]</span
+          <span v-if="sii !== 0"></span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span
         >
       </template>
 
@@ -78,10 +75,7 @@
           content="上次议价驳回原因"
           placement="top"
         >
-          <i
-            class="el-icon-warning tb-icon"
-            @click="show_reject(scope.row)"
-          ></i>
+          <i class="el-icon-warning tb-icon" @click="show_reject(scope.row)"></i>
         </el-tooltip>
 
         <el-tooltip
@@ -101,10 +95,7 @@
           content="发起议价流程"
           placement="top"
         >
-          <i
-            class="el-icon-s-flag tb-icon"
-            @click="wantBargaining(scope.row)"
-          ></i>
+          <i class="el-icon-s-flag tb-icon" @click="wantBargaining(scope.row)"></i>
         </el-tooltip>
         <el-tooltip
           v-if="
@@ -119,10 +110,7 @@
           content="选择该商品"
           placement="top"
         >
-          <i
-            class="el-icon-s-check tb-icon"
-            @click="change_goods(scope.row.bidNo)"
-          ></i>
+          <i class="el-icon-s-check tb-icon" @click="change_goods(scope.row.bidNo)"></i>
         </el-tooltip>
         <el-tooltip
           v-if="
@@ -137,10 +125,7 @@
           content="下单"
           placement="top"
         >
-          <i
-            class="el-icon-shopping-cart-2 tb-icon"
-            @click="buy_goods(scope.row)"
-          ></i>
+          <i class="el-icon-shopping-cart-2 tb-icon" @click="buy_goods(scope.row)"></i>
         </el-tooltip>
       </template>
     </ex-table>
@@ -189,7 +174,7 @@
     </el-dialog>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/zixunOrder";
@@ -259,7 +244,7 @@ export default {
         { id: "9", label: "boss通过", type: "success" },
         { id: "10", label: "boss越线通过", type: "" },
         { id: "11", label: "boss驳回", type: "danger" },
-        { id: "12", label: "取消议价", type: "info" },//已选完商品，取消议价
+        { id: "12", label: "取消议价", type: "info" }, //已选完商品，取消议价
       ],
       options: [
         { id: "0", label: "待发布竞标" },
@@ -440,9 +425,10 @@ export default {
         });
     },
     buy_goods(row) {
-      const { company, khname, platform_name, arrival_time, num } = this.sitem;
+      const { company, companyNo, khname, platform_name, arrival_time, num } = this.sitem;
       this.bayGoodItem = JSON.parse(JSON.stringify(row));
       this.bayGoodItem.in_company = company;
+      this.bayGoodItem.in_companyNo = companyNo;
       this.bayGoodItem.in_khname = khname;
       this.bayGoodItem.in_platform_name = platform_name;
       this.bayGoodItem.in_arrival_time = arrival_time;
@@ -453,16 +439,10 @@ export default {
     },
     // 时间选择事件
     async handleTime(e) {
-      if (e.startTime !== "") {
-        this.parmValue.start = e.startTime;
-      } else {
-        this.parmValue.start = "";
-      }
-      if (e.endTime !== "") {
-        this.parmValue.end = e.endTime;
-      } else {
-        this.parmValue.end = "";
-      }
+      const { startTime, endTime } = e;
+      this.parmValue.start = startTime || "";
+      this.parmValue.end = endTime || "";
+
       if (this.parmValue.start !== "" && this.parmValue.end !== "") {
         this.pageInfo.curr = 1;
         this.parmValue.page = 1;
@@ -484,7 +464,7 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .zixunOrder {
 }
 
@@ -492,4 +472,3 @@ export default {
   width: 1024px;
 }
 </style>
-