build

src/apis/service/sellOut/salesOrder/detail.js

@@ -23,6 +23,7 @@ export default {
   saleaddr: (data, params) => http(api + 'saleaddr', data, 'post', params),
   // 发货单列表
   orderOut: (data, params) => http(api + 'xsaleout', data, 'post', params),
+  child_list: (data, params) => http(api + 'child_list', data, 'post', params),
 
   supplierOrderOut: (data, params) => http(api + 'supplierOutList', data, 'post', params),
 

src/apis/service/sellOut/sellReturn/index.js

@@ -17,6 +17,7 @@ export default {
   //
   getReason: (data, params) => http(api + 'resultlist', data, 'post', params),
   // 退货审核
-  returnCheck: (data, params) => http(api + 'reorderexam', data, 'post', params)
+  returnCheck: (data, params) => http(api + 'reorderexam', data, 'post', params),
+  child_list: (data, params) => http(api + 'reorder_child_list', data, 'post', params)
 }
 

src/apis/service/sellOut/stockApply/index.js

@@ -22,6 +22,6 @@ export default {
   // 备库反馈详情
   feeDetail: (data, params) => http(api + 'feedinfo', data, 'post', params),
   // 反馈状态修改
-  feeChange: (data, params) => http(api + 'feedchange', data, 'post', params)
-
+  feeChange: (data, params) => http(api + 'feedchange', data, 'post', params),
+  goods_detail: (data, params) => http(api + 'goodupinfo', data, 'post', params)
 }

src/views/purchaseIn/wsmInOrder/index.vue

@@ -104,6 +104,7 @@
                       searchList();
                     "
                   >
+                  <el-select style="width:140px" v-model="select" slot="prepend">
                     <el-option label="采购单编号" value="1"></el-option>
                     <el-option label="入库单编号" value="2"></el-option>
                     <!-- <el-option label="备库编号" value="3"></el-option> -->
@@ -113,6 +114,7 @@
                     <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
                     <el-option label="申请人部门" value="8"></el-option>
                   </el-select>
+
                   <el-button
                     slot="append"
                     @click="

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -81,17 +81,26 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('2') && String(sitem.status) === '12' && !isSupertube">
+            <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('1') && String(sitem.status) === '12' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
+
+
+        <el-tab-pane label="审批记录" name="2">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'THGD'"
+            :orderCode="sitem.returnCode"
+          />
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-else>
       <no-auth></no-auth>
     </div>
-
     <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
   </div>
 </template>

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -100,6 +100,15 @@
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
+
+        <el-tab-pane label="审批记录" name="2">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'FHGD'"
+            :orderCode="queryId"
+          />
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-else>
@@ -183,6 +192,7 @@ export default {
         this.is_stock = is_stock;
         this.status = status;
         this.sitem = data;
+        // this.queryId = this.s
         this.getNewTime();
       } else if (code >= 100 && code <= 104) {
         await this.logout();
@@ -196,3 +206,4 @@ export default {
   },
 };
 </script>
+

src/views/sellOut/salesOrder/components/child-list.vue

@@ -0,0 +1,575 @@
+<template>
+  <div class="outOrderTable">
+    <el-table
+      ref="addrForm"
+      :data="tableData"
+      border
+      :size="'mini'"
+      style="width: 100%"
+      row-key="key"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="42"> </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="outCode"
+        label="发货单号"
+        width="160"
+      />
+
+      <el-table-column show-overflow-tooltip prop="send_status" label="状态" width="105">
+        <template slot-scope="scope">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              '--'
+            "
+          ></el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="send_num"
+        label="发货数量"
+        width="80"
+      />
+      <el-table-column show-overflow-tooltip prop="contactor" label="联系人" width="80" />
+      <el-table-column show-overflow-tooltip prop="mobile" label="联系电话" width="110" />
+      <el-table-column show-overflow-tooltip prop="addr" label="收货地址" min-width="170">
+        <template slot-scope="scope">
+          {{ scope.row.addr_info }}{{ scope.row.addr }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_name"
+        label="物流公司"
+        width="160"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_code"
+        label="物流单号"
+        width="160"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="sendtime"
+        label="发货时间"
+        width="145"
+      />
+      <el-table-column fixed="right" width="150">
+        <template slot="header" slot-scope="scope">
+          <span v-if="addr_res + '' === '0'">操作</span>
+          <el-tooltip
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            class="fr"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
+            content="添加"
+            placement="top"
+          >
+            <i
+              class="el-icon-circle-plus-outline tb-icon"
+              style="color: #6954f0; magin: 0 0 0 10px"
+              @click="openHouseModal()"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            class="fr"
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
+            content="导入收货地址"
+            placement="top"
+          >
+            <i
+              class="el-icon-upload2 tb-icon"
+              style="color: #6954f0"
+              @click="addrmodel = true"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            class="fr"
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
+            content="下载收货地址模板"
+            placement="top"
+          >
+            <a class="downloadAddr" href="./static/收货地址模板.xlsx">
+              <i class="el-icon-download tb-icon" style="color: #6954f0; margin: 0"></i>
+            </a>
+          </el-tooltip>
+
+          <el-tooltip
+            style="margin: 3px 0 0 0"
+            effect="dark"
+            content="退货"
+            class="fr"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '051')"
+            placement="top"
+          >
+            <i
+              class="el-icon-delete tb-icon"
+              style="color: #6954f0; magin: 0 0 0 10px"
+              @click="openModal(0)"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            effect="dark"
+            content="批量退货"
+            style="margin: 3px 0 0 8px"
+            v-if="batch_num + '' !== '0' && powers.some((i) => i == '051')"
+            placement="top"
+          >
+            <i
+              class="el-icon-date tb-icon"
+              style="color: #6954f0"
+              @click="openModal()"
+            ></i>
+          </el-tooltip>
+          <!-- <el-tooltip
+            effect="dark"
+            content="全部退货"
+            style="margin: 3px 0 0 8px"
+            v-if="status + '' === '0' && powers.some((i) => i == '051')"
+            placement="top"
+          >
+            <i
+              class="el-icon-refresh-left tb-icon"
+              style="color: #6954f0"
+              @click="openAllModal()"
+            ></i>
+          </el-tooltip> -->
+        </template>
+
+        <template slot-scope="scope">
+          <el-tooltip
+            effect="dark"
+            content="查看"
+            placement="top"
+            v-if="powers.some((i) => i == '007')"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('sellOutOrderDetail', { id: scope.row.outCode })"
+            ></i>
+          </el-tooltip>
+          <!-- <el-tooltip
+            effect="dark"
+            content="退货"
+            v-if="
+              (scope.row.status == '0' || scope.row.status == '1') &&
+              powers.some((i) => i == '051')
+            "
+            placement="top"
+          >
+            <i class="el-icon-delete tb-icon" @click="openModal(scope.row)"></i>
+          </el-tooltip> -->
+        </template>
+      </el-table-column>
+    </el-table>
+    <div
+      v-if="tableData && tableData.length > 0"
+      class="Pagination"
+      style="text-align: right; margin-top: 10px"
+    >
+      <el-pagination
+        :current-page="parmValue.page"
+        :page-size="parmValue.size"
+        :size="'mini'"
+        layout="total,  prev, pager, next, jumper"
+        :total="pageInfo.total"
+        @size-change="page_size_change"
+        @current-change="page_curr_change"
+      />
+    </div>
+
+    <out-order-add-model
+      :showModel="modelShowModel"
+      :id="modelId"
+      :sitem="modelItem"
+      @refresh="refresh"
+      @cancel="closeModel"
+    />
+    <in-addr-model
+      :show-model="addrmodel"
+      @cancel="addrmodel = false"
+      @refresh="addrRefresh"
+    />
+
+    <add-model
+      :id="returnId"
+      :sitem="returnItem"
+      :show-model="returnModel"
+      :is-detail="false"
+      @refresh="refresh"
+      @cancel="returnModel = false"
+    />
+
+    <!-- <add-edit
+      :id="modelId"
+      :sitem="s_sitem"
+      :show-model="showModel"
+      :is-detail="isDetail"
+      @refresh="searchList"
+      @cancel="showModel = false"
+    /> -->
+
+    <add-return-all-model
+      :id="returnAllId"
+      :sitem="returnAllSitem"
+      :show-model="returnAllShowModel"
+      :is-detail="false"
+      @refresh="refresh"
+      @cancel="returnAllShowModel = false"
+    />
+  </div>
+</template>
+<script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
+import outOrderAddModel from "./out-order-add-model";
+import addModel from "@/views/sellOut/sellReturn/components/addModel";
+import inAddrModel from "@/components/in-address-model";
+import addReturnAllModel from "./addReturnAllModel";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "salesOrderDetail",
+  mixins: [mixinPage, resToken],
+  props: ["newTime", "id", "sitem"],
+  components: { outOrderAddModel, addModel, inAddrModel, addReturnAllModel },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "salesOrderDetail"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+
+  data() {
+    return {
+      orderCode: "",
+      outCode: "",
+      addr_res: 0,
+      batch_num: 0,
+      addrmodel: false,
+      // 状态
+      statusOptions: [
+        { id: "0", label: "待公司采购" },
+        { id: "1", label: "待库管发货" },
+        { id: "2", label: "已发货待收货" },
+        { id: "3", label: "已收货" },
+        { id: "4", label: "已全部退货" },
+      ],
+      showGoodsModel: false,
+      stock_code: "",
+      tableData: [],
+      loading: false,
+      queryId: "",
+      status: "",
+      showModel: null,
+      modelId: "",
+      modelItem: null,
+      s_sitem: null,
+      returnId: "",
+      returnItem: null,
+      returnModel: false,
+      wsend_num: "",
+      orderCode: "",
+      returnAllId: "",
+      returnAllSitem: null,
+      returnAllShowModel: false,
+      parmValue: {
+        order_type: "",
+        orderCode: "",
+        apply_name: "", //申请人名称
+        cgdNo: "",
+        start: "",
+        end: "",
+        // supplierNo: "",
+        companyNo: "",
+        good_code: "",
+        good_name: "",
+        outCode: "",
+        status: "",
+        company_name: "", //申请人部门
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      multipleSelection: [],
+      resModel: null,
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    closeModel() {
+      this.modelId = "";
+      this.modelShowModel = false;
+    },
+    refresh() {
+      this.$emit("refresh");
+      this.modelId = "";
+      this.modelShowModel = false;
+    },
+    async initForm() {
+      this.status = "";
+      this.queryId = this.$route.query.id;
+      // this.rulesThis = this.rules;
+      this.resetForm();
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(async () => {
+        this.wsend_num = true;
+        const { orderCode, status, good_num, addr_sum } = this.sitem;
+        this.status = status;
+        this.orderCode = orderCode || "";
+        this.addr_res = parseInt(good_num) - parseInt(addr_sum);
+        if (this.addr_res < 0) {
+          this.addr_res = "0";
+        }
+        // console.log(this.status);
+        await this.searchList();
+        // this.tableData = JSON.parse(JSON.stringify(addrs));
+      });
+    },
+    // 列表搜索
+    async searchList() {
+      this.parmValue.orderCode = this.orderCode;
+      const { code, data, message } = await asyncRequest.orderOut(this.parmValue);
+      if (code === 0) {
+        const { list, count } = data;
+        this.tableData = list;
+        this.pageInfo.total = Number(count);
+        this.batch_num = 0;
+        this.tableData.forEach((v) => {
+          v.good_class = "";
+          if (v.can && v.can.length > 0) {
+            v.can.forEach((x, i) => {
+              v.good_class += i === 0 ? x.name : "/" + x.name;
+            });
+          }
+          if (v.status + "" === "0" || v.status + "" === "1") {
+            this.batch_num += parseInt(v.send_num + "");
+          }
+        });
+        console.log(this.batch_num);
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    async addrRefresh(e) {
+      if (!this.loading) {
+        this.loading = true;
+        const { arrive_time, orderCode, wsend_num } = this.sitem;
+        const { list } = e;
+    
+        let t_num = 0,
+          add_num = 0;
+        let model = {
+          arrtime: arrive_time,
+          orderCode: orderCode,
+          addrlist: [],
+        };
+        list.forEach((a) => {
+          add_num += a.receipt_quantity * 1;
+          let item = {
+            contactor: a.contactor,
+            mobile: a.mobile,
+            addr: a.addr,
+            addr_code: a.addr_code,
+            receipt_quantity: a.receipt_quantity,
+          };
+          model.addrlist.push(item);
+        });
+        if (wsend_num * 1 < t_num + add_num) {
+          this.$message.warning("导入地址总数量不能大于未发货总数量！");
+          this.loading = false;
+          return;
+        }
+        const { code, message } = await asyncRequest.saleaddr(model);
+        if (code === 0) {
+          this.$notify.success({
+            title: "地址导入成功！",
+            message: "",
+          });
+          this.showModelThis = false;
+          this.addrmodel = false;
+          this.loading = false;
+          // 刷新
+          this.$emit("refresh");
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(message);
+        }
+      }
+
+      // this.tableData = [];
+      // this.tableData.push(...list);
+    },
+    editRow(index) {
+      let findex = this.stockForm.good_stock.findIndex((v) => v.edit === true);
+      if (findex !== -1) {
+        this.$message.warning("当前已有发货仓库信息在编辑，请保存后再试！");
+        return;
+      } else {
+        this.stockForm.good_stock[index].edit = true;
+      }
+    },
+
+    openHouseModal() {
+      this.modelId = "add";
+      this.modelItem = this.sitem;
+      this.modelShowModel = true;
+    },
+    openModal(e) {
+      if (e === 0) {
+        this.resModel = {
+          good_num: this.addr_res + "",
+          orderCode: this.orderCode,
+          return_type: "1",
+          remark: "", //退货备注
+          errorCode: "", //退货原因
+          thnum: this.addr_res + "",
+          returnT: this.addr_res + "",
+          returnAddr: [],
+        };
+        this.returnItem = this.resModel;
+        this.returnModel = true;
+        //  scope.row.outCode
+      } else {
+        let tol = 0,
+          send_num = 0;
+        this.multipleSelection.forEach((s) => {
+          console.log(parseInt(s.send_num + ""));
+          if (!(s.status + "" === "0" || s.status + "" === "1")) {
+            tol += parseInt(s.send_num + "");
+          } else {
+            send_num += parseInt(s.send_num + "");
+          }
+        });
+        console.log(tol, send_num);
+        if (this.multipleSelection.length == 0) {
+          this.$message.warning("请选择发货单！");
+        } else if (tol !== 0) {
+          this.$message.warning("不能已发货的发货单！");
+        } else {
+          // const { addrid, send_num, outCode } = e;
+          this.resModel = {
+            good_num: send_num + "",
+            orderCode: this.orderCode,
+            return_type: "2",
+            remark: "", //退货备注
+            errorCode: "", //退货原因
+            thnum: send_num + "",
+            returnT: send_num + "",
+            returnAddr: JSON.parse(JSON.stringify(this.multipleSelection)),
+          };
+          this.returnItem = this.resModel;
+          this.returnModel = true;
+        }
+      }
+
+      console.log(addModel);
+    },
+    async restSearch() {
+      this.parmValue = {
+        order_type: "",
+        orderCode: "",
+        apply_name: "", //申请人名称
+        cgdNo: "",
+        start: "",
+        end: "",
+        // supplierNo: "",
+        companyNo: "",
+        good_code: "",
+        good_name: "",
+        outCode: "",
+        status: "",
+        company_name: "", //申请人部门
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      await this.searchList();
+    },
+    async page_size_change(e) {
+      this.parmValue.size = e;
+      this.pageInfo.size = e;
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
+    },
+    async page_curr_change(e) {
+      this.parmValue.page = e;
+      this.pageInfo.curr = e;
+      await this.searchList();
+    },
+    async openAllModal() {
+      const { good_num } = this.sitem;
+      this.returnAllId = this.orderCode;
+      this.returnAllSitem = {
+        orderCode: this.orderCode,
+        remark: "", //退货备注
+        errorCode: "", //退货原因
+        thnum: good_num + "",
+        returnT: good_num + "",
+      };
+      this.returnAllShowModel = true;
+
+      // await this.$confirm("确定要全部退货？", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // })
+      //   .then(async () => {
+      //     console.log("1111111111");
+      //   })
+      //   .catch(() => {
+      //     console.log("取消");
+      //   });
+      //
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -13,7 +13,22 @@
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货单号"
+        label="发货工单号"
+        width="160"
+      />
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="outCode"
+        label="发货单编号"
+        width="160"
+      />
+
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="outCode"
+        label="确认单编号"
         width="160"
       />
 
@@ -33,145 +48,17 @@
       <el-table-column
         show-overflow-tooltip
         prop="send_num"
-        label="发货数量"
+        label="总数量"
         width="80"
       />
-      <el-table-column show-overflow-tooltip prop="contactor" label="联系人" width="80" />
-      <el-table-column show-overflow-tooltip prop="mobile" label="联系电话" width="110" />
-      <el-table-column show-overflow-tooltip prop="addr" label="收货地址" min-width="170">
-        <template slot-scope="scope">
-          {{ scope.row.addr_info }}{{ scope.row.addr }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_name"
-        label="物流公司"
-        width="160"
-      />
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_code"
-        label="物流单号"
-        width="160"
-      />
-      <el-table-column
-        show-overflow-tooltip
-        prop="sendtime"
-        label="发货时间"
-        width="145"
-      />
-      <el-table-column fixed="right" width="150">
-        <template slot="header" slot-scope="scope">
-          <span v-if="addr_res + '' === '0'">操作</span>
-          <el-tooltip
-            style="margin: 3px 0 0 8px"
-            effect="dark"
-            class="fr"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
-            content="添加"
-            placement="top"
-          >
-            <i
-              class="el-icon-circle-plus-outline tb-icon"
-              style="color: #6954f0; magin: 0 0 0 10px"
-              @click="openHouseModal()"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            class="fr"
-            style="margin: 3px 0 0 8px"
-            effect="dark"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
-            content="导入收货地址"
-            placement="top"
-          >
-            <i
-              class="el-icon-upload2 tb-icon"
-              style="color: #6954f0"
-              @click="addrmodel = true"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            class="fr"
-            style="margin: 3px 0 0 8px"
-            effect="dark"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
-            content="下载收货地址模板"
-            placement="top"
-          >
-            <a class="downloadAddr" href="./static/收货地址模板.xlsx">
-              <i class="el-icon-download tb-icon" style="color: #6954f0; margin: 0"></i>
-            </a>
-          </el-tooltip>
 
-          <el-tooltip
-            style="margin: 3px 0 0 0"
-            effect="dark"
-            content="退货"
-            class="fr"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '051')"
-            placement="top"
-          >
-            <i
-              class="el-icon-delete tb-icon"
-              style="color: #6954f0; magin: 0 0 0 10px"
-              @click="openModal(0)"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            effect="dark"
-            content="批量退货"
-            style="margin: 3px 0 0 8px"
-            v-if="batch_num + '' !== '0' && powers.some((i) => i == '051')"
-            placement="top"
-          >
-            <i
-              class="el-icon-date tb-icon"
-              style="color: #6954f0"
-              @click="openModal()"
-            ></i>
-          </el-tooltip>
-          <!-- <el-tooltip
-            effect="dark"
-            content="全部退货"
-            style="margin: 3px 0 0 8px"
-            v-if="status + '' === '0' && powers.some((i) => i == '051')"
-            placement="top"
-          >
-            <i
-              class="el-icon-refresh-left tb-icon"
-              style="color: #6954f0"
-              @click="openAllModal()"
-            ></i>
-          </el-tooltip> -->
-        </template>
-
-        <template slot-scope="scope">
-          <el-tooltip
-            effect="dark"
-            content="查看"
-            placement="top"
-            v-if="powers.some((i) => i == '007')"
-          >
-            <i
-              class="el-icon-view tb-icon"
-              @click="routeGoto('sellOutOrderDetail', { id: scope.row.outCode })"
-            ></i>
-          </el-tooltip>
-          <!-- <el-tooltip
-            effect="dark"
-            content="退货"
-            v-if="
-              (scope.row.status == '0' || scope.row.status == '1') &&
-              powers.some((i) => i == '051')
-            "
-            placement="top"
-          >
-            <i class="el-icon-delete tb-icon" @click="openModal(scope.row)"></i>
-          </el-tooltip> -->
-        </template>
-      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="contactor" label="仓库名称" width="80" />
+      <el-table-column show-overflow-tooltip prop="mobile" label="仓库编号" width="110" />
+      <el-table-column show-overflow-tooltip prop="mobile" label="商品成本编码" width="110" />
+      <el-table-column show-overflow-tooltip prop="mobile" label="商品上线编码" width="110" />
+      <el-table-column show-overflow-tooltip prop="mobile" label="下单时间" width="110" />
+      <el-table-column show-overflow-tooltip prop="mobile" label="申请人" width="110" />
+      
     </el-table>
     <div
       v-if="tableData && tableData.length > 0"
@@ -211,15 +98,6 @@
       @cancel="returnModel = false"
     />
 
-    <!-- <add-edit
-      :id="modelId"
-      :sitem="s_sitem"
-      :show-model="showModel"
-      :is-detail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    /> -->
-
     <add-return-all-model
       :id="returnAllId"
       :sitem="returnAllSitem"

src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -20,8 +20,8 @@
             <span>{{ scope.row.wsm_name }}</span>
           </template>
         </el-table-column>
-
         <el-table-column prop="num" label="发货数量" show-overflow-tooltip />
+
         <el-form>
           <el-table-column width="110px" show-overflow-tooltip>
             <template slot="header">

src/views/sellOut/sellAfterApply/components/show-work-order.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="work-order__wrapper">
+    <el-table size="mini" border :data="list">
+      <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
+      <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
+      <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
+      <el-table-column label="发货仓库名称" prop="wsm_name" min-width="180px" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-popover placement="top" width="380" trigger="hover">
+            <h3>发货仓库</h3>
+            <ul>
+              <li>编码 : {{ scope.row.send_wsm_code }}</li>
+              <li>负责人 : {{ scope.row.send_contactor_name }}</li>
+              <li>所在供应商名称 : {{ scope.row.send_supplierName }}</li>
+              <li>所在供应商编码 : {{ scope.row.send_supplierNo }}</li>
+            </ul>
+            <i slot="reference" class="el-icon-warning-outline" />
+          </el-popover>
+          <span>{{ scope.row.send_wsm_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="退货数量" prop="return_num" width="110px" show-overflow-tooltip />
+      <el-table-column label="退货仓库" align="center">
+        <el-table-column label="仓库名称" prop="return_wsm_name" show-overflow-tooltip min-width="160px" />
+        <!-- <el-table-column label="仓库编码" prop="return_wsm_code" show-overflow-tooltip min-width="160px" /> -->
+        <el-table-column label="所在供应商名称" prop="return_supplierName" width="160px" show-overflow-tooltip />
+        <el-table-column label="所在供应商编码" prop="return_supplierNo" width="160px" show-overflow-tooltip />
+        <el-table-column label="负责人" width="110px" prop="return_contactor_name" show-overflow-tooltip />
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import asyncRequest from '@/apis/service/sellOut/sellAfterApply'
+import companyHelper from '@/mixins/companyHelper'
+import resToken from '@/mixins/resToken'
+export default {
+  name: 'WorkOrder',
+  mixins: [resToken, companyHelper],
+  props: ['sitem'],
+  data: () => ({
+    list: [],
+    loading: false,
+    subLoading: false,
+    companyNo: ''
+  }),
+  computed: {
+    paramsRules() {
+      return ({
+        return_wsm_code: [{
+          required: true,
+          message: '请选择退货仓库',
+          trigger: 'change'
+        }]
+      })
+    }
+  },
+  watch: {
+    sitem: {
+      async handler() {
+        console.log(this.sitem)
+        if (!this.sitem || !this.sitem.outCode) {
+          return
+        }
+
+        const { data, code, message } = await asyncRequest.afterChild({ outCode: this.sitem.outCode })
+        console.log(data)
+        switch (code) {
+          case 0:
+            this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+            break
+          default:
+            this.$message.warning(message)
+            break
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    onStockChange({ code, supplierName, supplierNo, contactor_name } = {}, index) {
+      this.$set(this.list, index, {
+        ...this.list[index],
+        return_wsm_code: code ? [code] : '',
+        returnSupplierName: supplierName,
+        returnSupplierNo: supplierNo,
+        returnSupplierNameContactor: contactor_name
+      })
+
+      this.$nextTick(() => this.$refs.formRef.validate())
+    },
+    onNumberChange(return_num, index) {
+      this.$set(this.list, index, {
+        ...this.list[index],
+        return_num
+      })
+    }
+  }
+}
+</script>

src/views/sellOut/sellAfterApply/detail.vue

@@ -140,6 +140,11 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
+
+            <el-collapse-item title="发货工单" name="10" v-if="sitem && sitem.status === '12' || sitem.status === '4' || sitem.status === '5'">
+                <show-work-order :sitem="sitem"  />
+            </el-collapse-item>
+
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"
@@ -176,7 +181,7 @@
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
 
-            <el-collapse-item name="8" title="待设置工单"  v-if="isHasPermission({status:'11', process:'11'})">
+            <el-collapse-item name="8" title="待设置工单" v-if="isHasPermission({status:'11', process:'11'})">
               <set-work-order :sitem="sitem" @reload="() => initData()" />
             </el-collapse-item>
 
@@ -218,6 +223,7 @@ import SupplierConfrim from "./components/supplier-confirm.vue";
 import ApprovalResults from "./components/approval-results.vue";
 import SetWorkOrder from "./components/set-work-order.vue"
 import WaitStockman from "./components/wait-stockman.vue";
+import ShowWorkOrder from "./components/show-work-order.vue";
 import { mapGetters } from "vuex";
 
 export default {
@@ -230,7 +236,8 @@ export default {
     SupplierConfrim,
     ApprovalResults,
     SetWorkOrder,
-    WaitStockman
+    WaitStockman,
+    ShowWorkOrder
   },
   computed: {
     ...mapGetters(['isSupertube']),
@@ -274,7 +281,7 @@ export default {
           label: "补发",
         },
       ],
-      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9","10"],
       status: "", //存储详情接口状态
       statusList: [],
       sellshowColumns: sellshowColumns,

src/views/sellOut/sellReturn/components/show-work-order.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="work-order__wrapper">
+    <el-table size="mini" border :data="list">
+      <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
+      <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
+      <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
+      <el-table-column label="发货仓库名称" prop="wsm_name" min-width="180px" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-popover placement="top" width="380" trigger="hover">
+            <h3>发货仓库</h3>
+            <ul>
+              <li>编码 : {{ scope.row.send_wsm_code }}</li>
+              <li>负责人 : {{ scope.row.send_contactor_name }}</li>
+              <li>所在供应商名称 : {{ scope.row.send_supplierName }}</li>
+              <li>所在供应商编码 : {{ scope.row.send_supplierNo }}</li>
+            </ul>
+            <i slot="reference" class="el-icon-warning-outline" />
+          </el-popover>
+          <span>{{ scope.row.send_wsm_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="退货数量" prop="return_num" width="110px" show-overflow-tooltip />
+      <el-table-column label="退货仓库" align="center">
+        <el-table-column label="仓库名称" prop="return_wsm_name" show-overflow-tooltip min-width="160px" />
+        <!-- <el-table-column label="仓库编码" prop="return_wsm_code" show-overflow-tooltip min-width="160px" /> -->
+        <el-table-column label="所在供应商名称" prop="return_supplierName" width="160px" show-overflow-tooltip />
+        <el-table-column label="所在供应商编码" prop="return_supplierNo" width="160px" show-overflow-tooltip />
+        <el-table-column label="负责人" width="110px" prop="return_contactor_name" show-overflow-tooltip />
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import asyncRequest from '@/apis/service/sellOut/sellReturn'
+import companyHelper from '@/mixins/companyHelper'
+import resToken from '@/mixins/resToken'
+export default {
+  name: 'WorkOrder',
+  mixins: [resToken, companyHelper],
+  props: ['sitem'],
+  data: () => ({
+    list: [],
+    loading: false,
+    subLoading: false,
+    companyNo: ''
+  }),
+  computed: {
+    paramsRules() {
+      return ({
+        return_wsm_code: [{
+          required: true,
+          message: '请选择退货仓库',
+          trigger: 'change'
+        }]
+      })
+    }
+  },
+  watch: {
+    sitem: {
+      async handler() {
+        console.log(this.sitem)
+        if (!this.sitem || !this.sitem.outCode) {
+          return
+        }
+
+        const { data, code, message } = await asyncRequest.child_list({ outCode: this.sitem.outCode })
+        console.log(data)
+        switch (code) {
+          case 0:
+            this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+            break
+          default:
+            this.$message.warning(message)
+            break
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    onStockChange({ code, supplierName, supplierNo, contactor_name } = {}, index) {
+      this.$set(this.list, index, {
+        ...this.list[index],
+        return_wsm_code: code ? [code] : '',
+        returnSupplierName: supplierName,
+        returnSupplierNo: supplierNo,
+        returnSupplierNameContactor: contactor_name
+      })
+
+      this.$nextTick(() => this.$refs.formRef.validate())
+    },
+    onNumberChange(return_num, index) {
+      this.$set(this.list, index, {
+        ...this.list[index],
+        return_num
+      })
+    }
+  }
+}
+</script>

src/views/sellOut/sellReturn/detail.vue

@@ -135,6 +135,8 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
+            <el-collapse-item title="发货工单" name="10">
+            </el-collapse-item>
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"
@@ -145,7 +147,6 @@
                 :iscgd="false"
               />
             </el-collapse-item>
- 
             <el-collapse-item title="待业务审核" name="3" v-if="isHasPermission({status:'1', process:'1'})">
               <exam-form
                 v-if="newTime"
@@ -156,7 +157,6 @@
                 @searchChange="examForm"
               />
             </el-collapse-item>
-
             <el-collapse-item title="待供应商审核" name="4" v-if="isHasPermission({status:'9', process:'9'})">
               <exam-form
                 v-if="newTime"
@@ -167,11 +167,9 @@
                 @searchChange="examForm_supplier"
               />
             </el-collapse-item>
-
             <el-collapse-item title="供应商已驳回,待采购审核" name="5" v-if="isHasPermission({status:'8', process:'8'})">
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseExam" />
             </el-collapse-item>
-
             <el-collapse-item title="业务公司修改，待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'})">
               <exam-form
                 v-if="newTime"
@@ -189,7 +187,7 @@
 
           </el-collapse>
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2">
+       <el-tab-pane label="审批记录" name="2">
           <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
@@ -219,13 +217,15 @@ import { showColumns } from "./components/ShowDataTableColumns";
 import { xs_order_type_options } from "@/assets/js/statusList";
 import SetWorkOrder from "./components/set-work-order.vue"
 import { mapGetters } from "vuex";
+import ShowWorkOrder from "./components/show-work-order.vue"
 export default {
   name: "sellReturnDetail",
   mixins: [mixinPage, resToken],
   components: {
     comExamForm,
     ApprovalResults,
-    SetWorkOrder
+    SetWorkOrder,
+    ShowWorkOrder
   },
   computed: {
     ...mapGetters(['isSupertube']),
@@ -264,7 +264,7 @@ export default {
       ],
       xs_order_type_options,
       sitem: null, //传给组件
-      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7",'10'],
       sitem: null,
       status: "", //存储详情接口状态
       statusList: [

src/views/sellOut/stockApply/columns.js

@@ -99,6 +99,18 @@ const showColumns = [
     label: '创建时间',
     span: 6
   },
+  {
+    prop: 'wsm_name',
+    label: '仓库名称',
+    _slot_: 'wsm',
+    span: 12
+  },
+  {
+    prop: 'wsm_name',
+    label: '仓库所在供应商',
+    _slot_: 'wsm_supplier',
+    span: 12
+  },
   {
     prop: 'good_num',
     label: '采购数量',

src/views/sellOut/stockApply/components/ShowDataTableColumns.js

@@ -0,0 +1,236 @@
+const addColumns = [
+  {
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    span: 24
+  },
+  {
+    prop: 'good_info_img',
+    _slot_: 'good_info_img',
+    label: '详情图',
+    span: 24
+  },
+  {
+    prop: 'cat',
+    label: '分类',
+    _slot_: 'cat',
+    span: 24
+  },
+
+  {
+    prop: 'is_stock',
+    label: '是否库存品',
+    _slot_: 'is_stock',
+    span: 8
+  },
+
+  {
+    prop: 'good_unit',
+    label: '单位',
+    span: 8
+  },
+  {
+    prop: 'tax',
+    label: '税点',
+    append: '%',
+    span: 8
+  },
+
+  {
+    prop: 'exclusive',
+    label: '专属类型',
+    _slot_: 'exclusive',
+    span: 12
+  },
+  {
+    prop: 'brand_name',
+    label: '品牌',
+    span: 12
+  },
+  {
+    prop: 'weight',
+    label: '商品总克重',
+    _slot_: 'weight',
+    span: 24
+  },
+  {
+    prop: 'lead_time',
+    label: '工期',
+    span: 8
+  },
+  {
+    prop: 'delivery_day',
+    label: '物流',
+    span: 8
+  },
+  {
+    prop: 'cgder',
+    label: '采购人员',
+    span: 8
+  },
+  {
+    prop: 'delivery_place_cn',
+    label: '发货地',
+    span: 24
+  },
+  {
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
+  }
+]
+
+const showColumns = [
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    span: 6
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    span: 6
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    span: 6
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    span: 6
+  },
+
+  {
+    prop: 'supplierName',
+    label: '销售方公司',
+    _slot_: 'supplierName',
+    span: 12
+  },
+  {
+    prop: 'companyName',
+    label: '购买方公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+
+  {
+    prop: 'platform_name',
+    label: '所属平台',
+    span: 12
+  },
+  {
+    prop: 'apply_name',
+    label: '创建人',
+    span: 6
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'is_active',
+    label: '活动类型',
+    _slot_: 'is_active',
+    span: 12
+  },
+  {
+    prop: 'arrive_time',
+    label: '要求到货时间',
+    span: 6
+  },
+  {
+    prop: 'paytime',
+    label: '承诺付款时间',
+    span: 6
+  },
+
+  {
+    prop: 'good_num',
+    label: '购买数量',
+    span: 4
+  },
+  {
+    prop: 'send_num',
+    label: '已发数量',
+    span: 4
+  },
+  {
+    prop: 'wsend_num',
+    label: '未发数量',
+    span: 4
+  },
+  {
+    prop: 'th_num',
+    label: '退货数量',
+    span: 4
+  },
+
+  {
+    prop: 'sale_price',
+    label: '售价',
+    append: '元',
+    span: 4
+  },
+  {
+    prop: 'total_price',
+    label: '总金额',
+    append: '元',
+    span: 4
+  },
+  {
+    prop: 'returnCode',
+    label: '售后来源单号',
+    span: 6
+  },
+  {
+    prop: 'proof_id',
+    label: '凭证文件',
+    _slot_: 'proof_id',
+    span: 6
+  },
+
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    append: '元',
+    span: 6
+  },
+  {
+    prop: 'send_type',
+    label: '下单方式',
+    _slot_: 'send_type',
+    span: 6
+  },
+
+  {
+    prop: 'useage',
+    label: '订单用途',
+    span: 24
+  },
+
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  },
+
+  {
+    prop: 'platform_order',
+    label: '平台订单号',
+    span: 24
+  },
+  {
+    prop: 'workNo',
+    label: '其他单号',
+    span: 24
+  }
+]
+
+export { addColumns, showColumns }

src/views/sellOut/stockApply/components/addEdit.vue

@@ -24,9 +24,81 @@
               maxlength="100"
               :placeholder="'商品名称'"
               @focus="showGoodsModel = true"
-            ></el-input>
+            />
+
+            <show-data-table
+                  v-if="activeGoodDetail"
+                  border
+                  style="margin-top: 10px; padding: 0"
+                  :sitem="activeGoodDetail"
+                  :columns="ShowDataTableColumns"
+                >
+                  <template slot="good_name">
+                    <img
+                      v-viewer
+                      style="width: 23px; height: 23px; margin: 0 5px 0 0"
+                      class="fl"
+                      v-if="activeGoodDetail.good_thumb_img"
+                      :src="activeGoodDetail.good_thumb_img"
+                      alt=""
+                    />
+                    <span>{{ activeGoodDetail.good_name }}</span>
+                    <span v-for="(si, i) in activeGoodDetail.specinfo" :key="si.spec_id + i">
+                      <span>{{ i === 0 ? "--" : "__" }}</span
+                      ><span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+                    </span>
+                  </template>
+                  <template slot="good_info_img">
+                    <img
+                      class="fl"
+                      style="width: 23px; height: 23px; margin: 0 5px 0 0"
+                      v-viewer
+                      v-for="(si, i) in activeGoodDetail.good_info_img"
+                      :src="si"
+                      :key="si + i"
+                    />
+                  </template>
+                  <template slot="cat">
+                    <span v-for="(si, sii) in activeGoodDetail.cat_info" :key="si.id"
+                      ><span v-if="sii !== 0">_</span><span>{{ si.name }}</span>
+                    </span>
+                  </template>
+                  <template slot="exclusive">
+                    <span v-for="(si, sii) in activeGoodDetail.exclusive" :key="si.id"
+                      ><span v-if="sii !== 0">/</span><span>{{ si.name }}</span>
+                    </span>
+                  </template>
+                  <template slot="is_stock">
+                    <el-tag :size="'mini'">{{
+                      activeGoodDetail.is_stock + '' === "1" ? "是" : "否"
+                    }}</el-tag>
+                  </template>
+                  <template slot="weight">
+                    <span
+                      >商品总重：{{ activeGoodDetail.new_weight }}/{{
+                        activeGoodDetail.weight_unit
+                      }}</span
+                    >
+                    <span v-if="activeGoodDetail.metal_id"
+                      >--{{
+                        activeGoodDetail.noble_weight ? activeGoodDetail.noble_weight : "0"
+                      }}g--{{ activeGoodDetail.metal_name }}---{{
+                        activeGoodDetail.gold_price ? activeGoodDetail.gold_price : "0"
+                      }}元/g--{{
+                        activeGoodDetail.is_gold_price + '' === "0" ? "不" : ""
+                      }}启用实时金价--{{
+                        activeGoodDetail.is_diff + '' === "1" ? "有" : "无"
+                      }}工差--{{ activeGoodDetail.config }}---{{
+                        activeGoodDetail.other_config
+                      }}</span
+                    >
+                  </template>
+                </show-data-table>
           </el-form-item>
         </el-col>
+
+        
+
         <!-- 采购数量 -->
         <el-col :span="5">
           <el-form-item label="采购数量" prop="goods_num">
@@ -176,6 +248,7 @@
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/stockApply";
 import searchGoodModal from "@/components/search-good-modal";
+import { addColumns } from "./ShowDataTableColumns";
 export default {
   name: "stockApply",
   props: ["id", "sitem", "newTime", "type"],
@@ -228,9 +301,10 @@ export default {
       cat_id: "",
       routerId: "",
       stockCode: "",
-
+      activeGoodDetail: null,
       showGoodsModel: "",
       loading: false,
+      ShowDataTableColumns:addColumns,
       ruleForm: {
         id: "",
         good_code: "",
@@ -299,13 +373,45 @@ export default {
     },
 
     // 执行点击商品名称的抛出事件
-    addGoodsRes(e) {
-      console.log(e);
-      let { spuCode, good_name } = e[0];
+    async addGoodsRes(e) {
+      if(!e || e.length === 0) return
+      let { spuCode ,good_name } = e[0];
       this.ruleForm.good_name = good_name;
       this.ruleForm.good_code = spuCode;
+      await this.requseGoodDetail(spuCode);
       this.$refs.ruleForm.validateField("good_name");
     },
+
+    async requseGoodDetail(spuCode) {
+      this.dtaLoading = true
+      let { code, data, message } = await asyncRequest.goods_detail({spuCode});
+      this.dtaLoading = false
+
+      if (code === 0) {
+        this.activeGoodDetail = data;
+        this.activeGoodDetail.good_info_img = this.activeGoodDetail.good_info_img.split(",");
+        const { weight } = this.activeGoodDetail;
+        let kgnum = parseInt((weight * 1) / 1000);
+        let gnum = (weight * 1) % 1000;
+        let new_weight,
+          weight_unit = "";
+        if (kgnum > 0) {
+          weight_unit = "Kg";
+          new_weight = `${kgnum}.${gnum}`;
+        } else {
+          new_weight = weight;
+          weight_unit = "g";
+        }
+        this.activeGoodDetail.new_weight = new_weight;
+        this.activeGoodDetail.weight_unit = weight_unit;
+        this.ruleForm.good_code = this.activeGoodDetail.good_code;
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+
     number_change(e, key) {
       this.ruleForm[key] = e + "" || "0";
       this.$refs.ruleForm.validateField(key);

src/views/sellOut/stockApply/detail.vue

@@ -37,6 +37,31 @@
                     "
                   ></el-tag>
                 </template>
+
+                <template slot="wsm">
+                  <span>{{ sitem.wsm_name }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>仓库编码:</span><span>{{ sitem.wsm_code }}</span>
+                      </li>
+                    </ul>
+                    <i slot="reference" class="el-icon-warning-outline fr" />
+                  </el-popover>
+                </template>
+
+                <template slot="wsm_supplier">
+                  <span>{{ sitem.wsm_supplier }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>仓库所在供应商编码:</span><span>{{ sitem.wsm_supplierNo }}</span>
+                      </li>
+                    </ul>
+                    <i slot="reference" class="el-icon-warning-outline fr" />
+                  </el-popover>
+                </template>
+
                 <template slot="file_url">
                   <el-link :underline="false" :href="sitem.file_url" target="_blank">{{
                     sitem.file_name

src/views/standingBook/components/detail-data-table.vue

@@ -3,18 +3,18 @@
     <el-row class="purchaseOrderDetail-addForm">
       <template v-for="(colu, index) in columns">
         <el-col
-          :span="colu.span || 12"
-          class="purchaseOrderDetail-addForm-el-col"
           v-if="
             colu._slot_ || (colu.showProp && sitem[colu.prop]) || !colu.showProp
           "
           :key="colu + index"
+          :span="colu.span || 12"
+          class="purchaseOrderDetail-addForm-el-col"
         >
           <div class="label">{{ colu.label }}：</div>
-          <div class="name" v-if="colu._slot_">
-            <slot :name="colu._slot_" :slotName="colu._slot_"></slot>
+          <div v-if="colu._slot_" class="name">
+            <slot :name="colu._slot_" :slotName="colu._slot_" />
           </div>
-          <div class="name" v-else>
+          <div v-else class="name">
             <span>{{ sitem[colu.prop] }}</span>
             <span v-if="colu.append">{{ colu.append }}</span>
           </div>
@@ -26,16 +26,16 @@
 
 <script>
 export default {
-  name: "showDataTable",
+  name: 'ShowDataTable',
 
   props: {
     newTime: {
       type: String,
-      default: "",
+      default: ''
     },
     sitem: {
       type: Object,
-      default: () => {},
+      default: () => {}
     },
     /**
      * el-table-column 表格字段设置集合
@@ -47,34 +47,32 @@ export default {
      */
     columns: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     border: {
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
   },
-  computed: {},
   data() {
     return {
-      lodding: false,
-    };
+      lodding: false
+    }
   },
+  computed: {},
   watch: {
-    newTime: function (val) {
+    newTime: function(val) {
       if (val) {
         // this.initForm();
       }
-    },
+    }
   },
   mounted() {},
 
-  methods: {},
-};
+  methods: {}
+}
 </script>
 
-
-
 <style lang="scss" scoped>
 .hasborder {
   border-bottom: 1px solid #ebeef5 !important;

src/views/standingBook/components/detail11/columns.js

@@ -1,123 +1,120 @@
 
 const columns = [
   {
-    prop: "outCode",
-    label: "发货单号",
+    prop: 'outCode',
+    label: '发货单号',
     span: 6
   },
   {
-    prop: "status",
-    label: "发货单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '发货单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "orderCode",
-    label: "订单编号",
+    prop: 'orderCode',
+    label: '订单编号',
     span: 6
   },
   {
-    prop: "order_type",
-    label: "订单类别",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '订单类别',
+    _slot_: 'order_type',
     span: 6
   },
 
-
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 6
   },
 
- 
   {
-    prop: "sendtime",
-    label: "发货时间",
+    prop: 'sendtime',
+    label: '发货时间',
     span: 6
   },
 
   {
-    prop: "send_num",
-    label: "发货数量",
+    prop: 'send_num',
+    label: '发货数量',
     span: 6
   },
   {
-    prop: "check_num",
-    label: "验收数量",
+    prop: 'check_num',
+    label: '验收数量',
     span: 6
   },
 
   {
-    prop: "error_num",
-    label: "异常数量",
+    prop: 'error_num',
+    label: '异常数量',
     span: 6
   },
   {
-    prop: "sale_price",
-    label: "商品单价",
-    _slot_: "sale_price",
+    prop: 'sale_price',
+    label: '商品单价',
+    _slot_: 'sale_price',
     span: 6
   },
   {
-    prop: "total_price",
-    label: "发货单总价",
-    _slot_: "total_price",
+    prop: 'total_price',
+    label: '发货单总价',
+    _slot_: 'total_price',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "post_name",
-    label: "快递公司",
+    prop: 'post_name',
+    label: '快递公司',
     span: 6
   },
 
   {
-    prop: "post_fee",
-    label: "物流费用",
+    prop: 'post_fee',
+    label: '物流费用',
     span: 6
   },
   {
-    prop: "contactor",
-    label: "收货联系人",
+    prop: 'contactor',
+    label: '收货联系人',
     span: 6
   },
   {
-    prop: "mobile",
-    label: "收货联系人电话",
+    prop: 'mobile',
+    label: '收货联系人电话',
     span: 6
   },
   {
-    prop: "post_code",
-    label: "物流编号",
+    prop: 'post_code',
+    label: '物流编号',
     span: 12
   },
   {
-    prop: "addr",
-    label: "收货地址",
+    prop: 'addr',
+    label: '收货地址',
     span: 12
   },
 
   {
-    prop: "remark",
-    label: "发货备注",
+    prop: 'remark',
+    label: '发货备注',
     span: 24
-  },
-
+  }
 
 ]
 const statusOptions = [
-  { value: "1", label: "待采购反馈" },
-  { value: "2", label: "已生成采购单" },
+  { value: '1', label: '待采购反馈' },
+  { value: '2', label: '已生成采购单' },
   {
-    value: "4",
-    label: "已取消采购",
-  },
-];
+    value: '4',
+    label: '已取消采购'
+  }
+]
 
 const listColumns = [
   // {
@@ -126,31 +123,31 @@ const listColumns = [
   //   _noset_: true
   // },
   {
-    prop: "outCode",
-    label: "发货单编号",
-    width: "156"
+    prop: 'outCode',
+    label: '发货单编号',
+    width: '156'
   },
 
   {
-    prop: "orderCode",
-    label: "订单编号",
-    width: "156"
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '156'
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "156"
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '156'
   },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
 
   {
-    prop: "apply_name",
-    label: "申请人",
-    width: "70px",
+    prop: 'apply_name',
+    label: '申请人',
+    width: '70px'
   },
   // {
   //   prop: "orderCode",
@@ -158,30 +155,30 @@ const listColumns = [
   //   width: "160"
   // },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
 
   {
-    prop: "send_num",
-    label: "出库总数",
+    prop: 'send_num',
+    label: '出库总数'
   },
   {
-    prop: "good_class",
-    label: "商品分类",
-    width: "150"
+    prop: 'good_class',
+    label: '商品分类',
+    width: '150'
   },
   {
-    prop: "good_code",
-    label: "商品编码",
-    width: "140"
+    prop: 'good_code',
+    label: '商品编码',
+    width: '140'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
   // {
   //   prop: "supplierNo",
@@ -189,16 +186,15 @@ const listColumns = [
   //   width: "160"
   // },
 
-
   {
-    prop: "customer_code",
-    label: "客户编码",
-    width: "150"
+    prop: 'customer_code',
+    label: '客户编码',
+    width: '150'
   },
   {
-    prop: "companyName",
-    label: "客户名称",
-    width: "200"
+    prop: 'companyName',
+    label: '客户名称',
+    width: '200'
   },
   // {
   //   prop: "contactor",
@@ -210,40 +206,39 @@ const listColumns = [
   //   width: "100"
   // },
   {
-    prop: "post_name",
-    label: "物流公司",
+    prop: 'post_name',
+    label: '物流公司'
   },
   {
-    prop: "post_code",
-    label: "物流单号",
+    prop: 'post_code',
+    label: '物流单号'
   },
   {
-    prop: "post_fee",
-    label: "物流费用",
+    prop: 'post_fee',
+    label: '物流费用'
   },
   {
-    prop: "sendtime",
-    label: "发货时间",
-    width: "140"
+    prop: 'sendtime',
+    label: '发货时间',
+    width: '140'
   },
   {
-    prop: "send_num",
-    label: "发货数量",
+    prop: 'send_num',
+    label: '发货数量'
   },
   {
-    prop: "addtime",
-    label: "添加时间",
-    width: 150,
+    prop: 'addtime',
+    label: '添加时间',
+    width: 150
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: 50,
-  },
+    _slot_: 'operation',
+    width: 50
+  }
 ]
 
-
-export { columns, statusOptions, listColumns}
+export { columns, statusOptions, listColumns }

src/views/standingBook/components/detail11/main.vue

@@ -179,6 +179,9 @@ export default {
         { value: "2", label: "已发货待收货" },
         { value: "3", label: "已收货" },
         { value: "4", label: "已全部退货" },
+
+        /* CHANGE:STATUS **/
+        { value: "5", label: "已取消" }
       ],
       // 收到货状态
       status1Options: [

src/views/standingBook/components/detail12/columns.js

@@ -206,10 +206,7 @@ const listColumns = [
 const statusOptions = [
   { value: '1', label: '待采购反馈' },
   { value: '2', label: '已生成采购单' },
-  {
-    value: '4',
-    label: '已取消采购'
-  }
+  { value: '4', label: '已取消采购' }
 ]
 
 export { columns, statusOptions, listColumns }

src/views/standingBook/components/detail12/main.vue

@@ -14,7 +14,7 @@
             :type="sitem.status == '0' ? 'warning' : ''"
             v-text="
               (
-                (sitem.is_receive + '' === '0' ? status2Options : status1Options).find(
+                (status1Options).find(
                   (item) => item.id + '' === sitem.status + ''
                 ) || {}
               ).label || '--'
@@ -87,7 +87,7 @@
           :type="''"
           v-text="
             (
-              (scope.row.is_receive + '' === '0' ? status2Options : status1Options).find(
+              (status1Options).find(
                 (item) => item.id == scope.row.status
               ) || {}
             ).label || '--'
@@ -230,26 +230,41 @@ export default {
       sitem: null,
       newTime: "",
       loading: false,
+      // statusOptions
       // 收到货状态
       status1Options: [
+        // { id: "1", label: "待业务审核" },
+        // { id: "2", label: "待采购审核" },
+        // { id: "3", label: "待设置仓库" },
+        // { id: "4", label: "待客户退货" },
+        // { id: "5", label: "售后已完成" },
+        // { id: "6", label: "业务已驳回" },
+        // { id: "7", label: "采购已驳回" },
+        // { id: "8", label: "申请已取消" },
+
+        /* CHANGE:STATUS **/
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "待采购审核" },
-        { id: "3", label: "待设置仓库" },
-        { id: "4", label: "待客户退货" },
-        { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
-        { id: "7", label: "采购已驳回" },
+        { id: "9", label: "供应商审核" },
+        { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
+        { id: "10", label: "业务公司修改，待供应商确认" },
+        { id: "11", label: "待设置工单" }, //已收到货才有
+        //{ id: "2", label: "待设置仓库" },//节点废除
+        { id: "4", label: "待客户退货" }, //已收到货才有
+        { id: "12", label: "待库管收货" }, //已收到货才有
+        { id: "5", label: "售后已完成" },
+        //{ id: "7", label: "采购已驳回" },//节点废除
         { id: "8", label: "申请已取消" },
       ],
       // 未收到货状态
       status2Options: [
-        { id: "1", label: "待业务审核" },
-        { id: "2", label: "待采购审核" },
-        { id: "3", label: "待同意退货" },
-        { id: "5", label: "售后已完成" },
-        { id: "6", label: "业务已驳回" },
-        { id: "7", label: "采购已驳回" },
-        { id: "8", label: "申请已取消" },
+        // { id: "1", label: "待业务审核" },
+        // { id: "2", label: "待采购审核" },
+        // { id: "3", label: "待同意退货" },
+        // { id: "5", label: "售后已完成" },
+        // { id: "6", label: "业务已驳回" },
+        // { id: "7", label: "采购已驳回" },
+        // { id: "8", label: "申请已取消" },
       ],
       orderCode: "",
       return_code: "",

src/views/standingBook/components/detail13/main.vue

@@ -64,7 +64,6 @@
 import { columns, statusOptions, listColumens } from "./columns";
 // import { cg_order_type_options } from "@/assets/js/statusList";
 
-//————————————————
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/returnOrder";

src/views/standingBook/components/detail19/columns.js

@@ -0,0 +1,226 @@
+const columns = [
+
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    width: '160'
+  },
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    width: '160'
+  },
+  {
+    prop: 'orderCode',
+    label: '确认单编号',
+    width: '160'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '85px'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '85'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '85'
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    width: '70'
+  },
+  {
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '160'
+  },
+  {
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '160'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编码',
+    width: '160'
+  },
+  {
+    prop: 'skuCode',
+    label: '商品上线编码',
+    width: '160'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_code',
+    label: '客户编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+
+  // {
+  //   prop: 'send_status',
+  //   label: '分单状态',
+  //   _slot_: 'send_status',
+  //   width: '120px'
+  // },
+  {
+    prop: 'addtime',
+    label: '下单时间',
+    sortable: true,
+    width: 150
+  },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '80'
+  }
+]
+
+const listColumens = [
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    width: '160'
+  },
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    width: '160'
+  },
+  {
+    prop: 'orderCode',
+    label: '确认单编号',
+    width: '160'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '85px'
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    width: '70'
+  },
+  {
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '160'
+  },
+  {
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '160'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编码',
+    width: '160'
+  },
+  {
+    prop: 'skuCode',
+    label: '商品上线编码',
+    width: '160'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_code',
+    label: '客户编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+
+  // {
+  //   prop: 'send_status',
+  //   label: '分单状态',
+  //   _slot_: 'send_status',
+  //   width: '120px'
+  // },
+  {
+    prop: 'addtime',
+    label: '下单时间',
+    sortable: true,
+    width: 150
+  },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '80'
+  }
+
+]
+const statusOptions = [
+  { value: '0', label: '取消' },
+  { value: '1', label: '退货商品验收' },
+  { value: '2', label: '退货验收审核' },
+  { value: '3', label: '退货业务审核' },
+  { value: '4', label: '退货已完成' }
+]
+
+export { columns, statusOptions, listColumens }

src/views/standingBook/components/detail19/main.vue

@@ -0,0 +1,205 @@
+<template>
+  <div>
+    <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
+      <detailDatatable
+        :newTime="newTime"
+        v-if="newTime !== ''"
+        :sitem="sitem"
+        :columns="columns"
+        :border="true"
+      >
+        <template slot="status">
+          <el-tag
+            :size="'mini'"
+            :type="sitem.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.value == sitem.status) || {}).label ||
+              '--'
+            "
+          ></el-tag>
+        </template>
+      </detailDatatable>
+    </el-dialog>
+
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="listColumens"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+    >
+      <template #status="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusList.find((item) => item.value == scope.row.status) || {}).label ||
+            '--'
+          "
+        ></el-tag>
+      </template>
+      <template #operation="{ scope }">
+        <el-tooltip effect="dark" content="详情" placement="top">
+          <i class="el-icon-view tb-icon" @click="dilog(scope.row.thNo)"></i>
+        </el-tooltip>
+      </template>
+    </ex-table>
+  </div>
+</template>
+
+<script>
+import { columns, statusOptions, listColumens } from "./columns";
+// import { cg_order_type_options } from "@/assets/js/statusList";
+
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { mapGetters } from "vuex";
+import detailDatatable from "../detail-data-table";
+
+export default {
+  components: {
+    detailDatatable,
+  },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "standingBookDetail"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  props: ["queryId"],
+  data() {
+    return {
+      loading: true,
+      dialogTableVisible: false,
+      parmValue: {
+        order_type: "",
+        order_code: "", //销售订单编号
+        thNo: "", //退货编号
+        out_code: "", //销售出库编号
+        return_code: "", //售后退货编号
+        post_compay: "", //物流公司
+        post_code: "", //物流单号
+        start: "", //
+        end: "", //
+        status: "", //状态节点
+        customer_code: "", //退货客户编号
+        supplierName: "",
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      listColumens,
+      statusList: [
+        { value: "0", label: "待申请" },
+        { value: "1", label: "待验收" },
+        { value: "2", label: "待验收审核" },
+        { value: "3", label: "待业务审核" },
+        { value: "4", label: "完成退货" },
+      ],
+      // cg_order_type_options,
+      orderCode: "",
+      statusOptions,
+      // cost_detailArr: [],
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      status: "",
+      sitem: null,
+      loading: false,
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData(code) {
+      this.newTime = "";
+      let model = {
+        thNo: code,
+      };
+      const res = await asyncRequest.detail(model);
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        const { status, orderCode, can } = this.sitem;
+        this.status = status;
+        this.orderCode = orderCode;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+
+    async searchList() {
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      this.parmValue.order_code = this.queryId;
+      this.loading = true;
+
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.post_compay = model.post_compay.toString();
+      const res = await asyncRequest.list(model);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    dilog(thNo) {
+      this.dialogTableVisible = true;
+      this.initData(thNo);
+    },
+  },
+};
+</script>
+
+<style></style>

src/views/standingBook/components/detail2/columns.js

@@ -1,92 +1,90 @@
 const columns = [
   {
-    prop: "cgdNo",
-    label: "采购单编号",
+    prop: 'cgdNo',
+    label: '采购单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "采购单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '采购单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "order_type",
-    label: "采购单来源",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '采购单来源',
+    _slot_: 'order_type',
     span: 6
   },
   {
-    prop: "lasttime",
-    label: "要求入库时间",
+    prop: 'lasttime',
+    label: '要求入库时间',
     span: 6
   },
- 
+
   {
-    prop: "supplier_name",
-    label: "销售方公司",
-    _slot_: "supplier_name",
+    prop: 'supplier_name',
+    label: '销售方公司',
+    _slot_: 'supplier_name'
   },
   {
-    prop: "company",
-    label: "购买方公司",
-    _slot_: "company",
+    prop: 'company',
+    label: '购买方公司',
+    _slot_: 'company'
   },
 
   {
-    prop: "wsm",
-    label: "仓库信息",
-    _slot_: "wsm",
+    prop: 'wsm',
+    label: '仓库信息',
+    _slot_: 'wsm'
   },
- 
- 
- 
+
   {
-    prop: "total_fee",
-    label: "采购总成本",
-    flag:1,
-    _slot_:"total_fee",
+    prop: 'total_fee',
+    label: '采购总成本',
+    flag: 1,
+    _slot_: 'total_fee',
     span: 6
   },
   {
-    prop: "good_price",
-    label: "采购单价",
-    _slot_:"good_price",
-    flag:2,
+    prop: 'good_price',
+    label: '采购单价',
+    _slot_: 'good_price',
+    flag: 2,
     span: 6
   },
   {
-    prop: "good_num",
-    label: "采购总数量",
+    prop: 'good_num',
+    label: '采购总数量',
     span: 6
   },
   {
-    prop: "send_num",
-    label: "已发货数量",
+    prop: 'send_num',
+    label: '已发货数量',
     span: 6
   },
   {
-    prop: "wsend_num",
-    label: "未发货数量",
+    prop: 'wsend_num',
+    label: '未发货数量',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "gold_price",
-    label: "当前实时金价",
-    _slot_: "gold_price",
+    prop: 'gold_price',
+    label: '当前实时金价',
+    _slot_: 'gold_price',
     span: 12
   },
   {
-    prop: "customer",
-    label: "订单客户名称",
-    _slot_: "customer",
+    prop: 'customer',
+    label: '订单客户名称',
+    _slot_: 'customer',
     span: 12
-  },
+  }
   // {
   //   prop: "addr_info",
   //   label: "收货信息",
@@ -95,11 +93,11 @@ const columns = [
   // },
 ]
 const statusOptions = [
-  { value: "0", label: "待与供应商确认" },
-  { value: "1", label: "待入库" },
-  { value: "2", label: "部分入库" },
-  { value: "3", label: "入库完成" },
-  { value: "4", label: "已取消订单" },
-];
+  { value: '0', label: '待与供应商确认' },
+  { value: '1', label: '待入库' },
+  { value: '2', label: '部分入库' },
+  { value: '3', label: '入库完成' },
+  { value: '4', label: '已取消订单' }
+]
 
-export { columns, statusOptions, }
+export { columns, statusOptions }

src/views/standingBook/components/detail3/columns.js

@@ -1,113 +1,111 @@
 const columns = [
   {
-    prop: "wsm_in_code",
-    label: "入库单编号",
+    prop: 'wsm_in_code',
+    label: '入库单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "入库单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '入库单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
+    prop: 'cgdNo',
+    label: '采购单编号',
     span: 6
   },
 
   {
-    prop: "order_type",
-    label: "采购单来源",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '采购单来源',
+    _slot_: 'order_type',
     span: 6
   },
   {
-    prop: "company",
-    label: "购买方公司",
-    _slot_: "company",
+    prop: 'company',
+    label: '购买方公司',
+    _slot_: 'company'
   },
   {
-    prop: "wsm",
-    label: "仓库信息",
-    _slot_: "wsm",
+    prop: 'wsm',
+    label: '仓库信息',
+    _slot_: 'wsm'
   },
   {
-    prop: "post_fee",
-    label: "快递费用",
+    prop: 'post_fee',
+    label: '快递费用',
     span: 4
   },
   {
-    prop: "good_price",
-    label: "采购单价",
-    _slot_:"good_price",
+    prop: 'good_price',
+    label: '采购单价',
+    _slot_: 'good_price',
 
     span: 4
   },
   {
-    prop: "good_num",
-    label: "采购总数",
+    prop: 'good_num',
+    label: '采购总数',
     span: 4
   },
 
   {
-    prop: "send_num",
-    label: "入库数量",
+    prop: 'send_num',
+    label: '入库数量',
     span: 4
   },
   {
-    prop: "sendtype",
-    label: "发货方式",
-    _slot_: "sendtype",
+    prop: 'sendtype',
+    label: '发货方式',
+    _slot_: 'sendtype',
     span: 4
   },
   {
-    prop: "apply_name",
-    label: "发货人",
+    prop: 'apply_name',
+    label: '发货人',
     span: 4
   },
   {
-    prop: "post_company",
-    label: "快递公司",
+    prop: 'post_company',
+    label: '快递公司',
     span: 6
   },
   {
-    prop: "post_code",
-    label: "快递编号",
+    prop: 'post_code',
+    label: '快递编号',
     span: 6
   },
 
-
   {
-    prop: "sendtime",
-    label: "发货时间",
+    prop: 'sendtime',
+    label: '发货时间',
     span: 6
   },
 
-
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
-  },
+  }
 ]
 const listColumns = [
 
   {
-    prop: "wsm_in_code",
-    label: "入库单编号",
-    width: "155"
+    prop: 'wsm_in_code',
+    label: '入库单编号',
+    width: '155'
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "155px",
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '155px'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "110px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '110px'
   },
   // {
   //   prop: "bkcode",
@@ -126,26 +124,26 @@ const listColumns = [
   // },
 
   {
-    prop: "spuCode",
-    label: "商品成本编号",
-    width: "145px",
+    prop: 'spuCode',
+    label: '商品成本编号',
+    width: '145px'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    'min-width': "145px",
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    'min-width': '145px'
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    'width': "95px",
+    prop: 'brand_name',
+    label: '品牌',
+    'width': '95px'
   },
- 
+
   {
-    prop: "send_num",
-    label: "发货数量",
-    width: "80px",
+    prop: 'send_num',
+    label: '发货数量',
+    width: '80px'
   },
   // {
   //   prop: "post_company",
@@ -158,16 +156,16 @@ const listColumns = [
   //   width: "140px",
   // },
   {
-    prop: "post_fee",
-    label: "物流费用",
-    width: "100px",
+    prop: 'post_fee',
+    label: '物流费用',
+    width: '100px'
   },
 
   {
-    prop: "order_type",
-    label: "备货单",
-    _slot_: "order_type",
-    width: "130px",
+    prop: 'order_type',
+    label: '备货单',
+    _slot_: 'order_type',
+    width: '130px'
   },
   // {
   //   prop: "wsm_num",
@@ -184,7 +182,7 @@ const listColumns = [
   //   label: "验货人",
   //   width: "60px",
   // },
-  // 
+  //
   // {
   //   prop: "cgder",
   //   label: "供应商负责人",
@@ -222,39 +220,39 @@ const listColumns = [
   //   width: "145px",
   // },
   {
-    prop: "wsm_supplierNo",
-    label: "仓库公司编号",
-    width: "145px",
+    prop: 'wsm_supplierNo',
+    label: '仓库公司编号',
+    width: '145px'
   },
   {
-    prop: "wsm_supplier",
-    label: "仓库公司名称",
-    width: "155px",
+    prop: 'wsm_supplier',
+    label: '仓库公司名称',
+    width: '155px'
   },
   {
-    prop: "wsm_code",
-    label: "仓库编号",
-    width: "172px",
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '172px'
   },
   {
-    prop: "wsm_name",
-    label: "仓库名称",
-    width: "80px",
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '80px'
   },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
-    width: "60px",
+    prop: 'apply_name',
+    label: '申请人',
+    width: '60px'
   },
   {
-    prop: "sendtime",
-    label: "发货时间",
-    width: "145px",
+    prop: 'sendtime',
+    label: '发货时间',
+    width: '145px'
   },
   // {
   //   prop: "addtime",
@@ -262,43 +260,47 @@ const listColumns = [
   //   width: "145px",
   // },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
+    width: '50px',
+    _slot_: 'operation'
+  }
+]
+const statusOptions = [
+  // {
+  //   value: '0',
+  //   label: '待发货'
+  // },
+  // {
+  //   value: '1',
+  //   label: '待验货' // 029
+  // },
+  // {
+  //   value: '2',
+  //   label: '待审核'
+  // },
+  // {
+  //   value: '3',
+  //   label: '待入库'
+  // },
+  // {
+  //   value: '4',
+  //   label: '入库完成'
+  // },
+  // {
+  //   value: '5', // 30  || 32
+  //   label: '退货待物流'
+  // },
+  // {
+  //   value: '6',
+  //   label: '退货完成'
+  // }
+
+  /*  CHANGE:STATUS **/
+  { value: '1', label: '待库管验货' },
+  { value: '2', label: '入库完成' }
 ]
-const statusOptions =  [
-  {
-    value: "0",
-    label: "待发货",
-  },
-  {
-    value: "1",
-    label: "待验货", //029
-  },
-  {
-    value: "2",
-    label: "待审核",
-  },
-  {
-    value: "3",
-    label: "待入库",
-  },
-  {
-    value: "4",
-    label: "入库完成",
-  },
-  {
-    value: "5", //30  || 32
-    label: "退货待物流",
-  },
-  {
-    value: "6",
-    label: "退货完成",
-  },
-];
 
-export { columns, statusOptions,listColumns }
+export { columns, statusOptions, listColumns }

src/views/standingBook/components/detail4/columns.js

@@ -1,94 +1,94 @@
 const columns = [
   {
-    prop: "returnCode",
-    label: "采购退货单编号",
+    prop: 'returnCode',
+    label: '采购退货单编号',
     span: 6
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
+    prop: 'cgdNo',
+    label: '采购单编号',
     span: 6
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 6
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
     span: 6
   },
 
   {
-    prop: "good_num",
-    label: "总采购数量",
+    prop: 'good_num',
+    label: '总采购数量',
     span: 6
   },
   {
-    prop: "return_num",
-    label: "退货退货数量",
+    prop: 'return_num',
+    label: '退货退货数量',
     span: 6
   },
   {
-    prop: "good_price",
-    label: "采购单价",
-    _slot_:"good_price",
+    prop: 'good_price',
+    label: '采购单价',
+    _slot_: 'good_price',
     span: 6
   },
   {
-    prop: "return_price",
-    label: "退货总金额",
-    _slot_:"return_price",
+    prop: 'return_price',
+    label: '退货总金额',
+    _slot_: 'return_price',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "post_company",
-    label: "物流公司",
+    prop: 'post_company',
+    label: '物流公司',
     span: 6
   },
   {
-    prop: "post_code",
-    label: "物流编号",
-    span: 12,
+    prop: 'post_code',
+    label: '物流编号',
+    span: 12
   },
   {
-    prop: "return_contactor",
-    label: "退货联系人",
+    prop: 'return_contactor',
+    label: '退货联系人',
     span: 6
   },
   {
-    prop: "return_mobile",
-    label: "退货联系电话",
+    prop: 'return_mobile',
+    label: '退货联系电话',
     span: 6
   },
   {
-    prop: "return_addr",
-    label: "退货地址",
-    span: 12,
+    prop: 'return_addr',
+    label: '退货地址',
+    span: 12
   },
   {
-    prop: "error_remark",
-    label: "退货备注",
-    span: 24,
-  },
+    prop: 'error_remark',
+    label: '退货备注',
+    span: 24
+  }
 ]
 const listColumns = [
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "160"
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '160'
   },
   {
-    prop: "returnCode",
-    label: "退货单编号",
-    width: "160"
+    prop: 'returnCode',
+    label: '退货单编号',
+    width: '160'
   },
   // {确认单编号}
   // {order_type类型}
@@ -103,35 +103,35 @@ const listColumns = [
   //   width: "120px",
   // },
   {
-    prop: "order_type",
-    label: "退货来源",
+    prop: 'order_type',
+    label: '退货来源',
     // 1备库 2竞价
-    _slot_: "order_type",
-    width: "80px"
+    _slot_: 'order_type',
+    width: '80px'
   },
   {
-    prop: "spuCode",
-    label: "商品编号",
-    width: "160px"
+    prop: 'spuCode',
+    label: '商品编号',
+    width: '160px'
   },
   {
-    prop: "good_class",
-    label: "商品分类",
-    width: "130",
+    prop: 'good_class',
+    label: '商品分类',
+    width: '130'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
   {
-    prop: "return_num",
-    label: "退货数量",
+    prop: 'return_num',
+    label: '退货数量'
   },
   {
-    prop: "return_fee",
-    label: "退货总金额",
-    width: "100"
+    prop: 'return_fee',
+    label: '退货总金额',
+    width: '100'
   },
   // {
   //   prop: "post_company",
@@ -161,20 +161,20 @@ const listColumns = [
   // },
 
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
-    width: "50px",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
+    width: '50px',
     _noset_: true,
-    _slot_: "operation",
-  },
+    _slot_: 'operation'
+  }
 
 ]
 const statusOptions = [
   // { value: "0", label: "取消" },
   // { value: "1", label: "待业务审核" },
   // { value: "2", label: "通知财务部门" },
-  { value: "1", label: "采购退货成功" },
-];
+  { value: '1', label: '采购退货成功' }
+]
 
-export { columns, statusOptions, listColumns}
+export { columns, statusOptions, listColumns }

src/views/standingBook/components/detail5/columns.js

@@ -1,102 +1,97 @@
 const columns = [
   {
-    prop: "cgdNo",
-    label: "采购单编号",
+    prop: 'cgdNo',
+    label: '采购单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "order_type",
-    label: "采购单类型",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '采购单类型',
+    _slot_: 'order_type',
     span: 6
   },
   {
-    prop: "diff_weight",
-    label: "重量工差",
+    prop: 'diff_weight',
+    label: '重量工差',
     span: 6
   },
   {
-    prop: "diff_price",
-    _slot_:"diff_price",
-    label: "金额差价",
+    prop: 'diff_price',
+    _slot_: 'diff_price',
+    label: '金额差价',
     span: 6
   },
   {
-    prop: "gold_price",
-    label: "实时金价",
-    _slot_:"gold_price",
+    prop: 'gold_price',
+    label: '实时金价',
+    _slot_: 'gold_price',
     span: 6
   },
   {
-    prop: "diff_is_act",
-    label: "客户反馈",
-    _slot_: "diff_is_act",
+    prop: 'diff_is_act',
+    label: '客户反馈',
+    _slot_: 'diff_is_act',
     span: 6
   },
   {
-    prop: "diff_customer_remark",
-    label: "客户意愿",
-    _slot_: "diff_customer_remark",
+    prop: 'diff_customer_remark',
+    label: '客户意愿',
+    _slot_: 'diff_customer_remark',
     span: 6
   },
   {
-    prop: "diff_remark",
-    label: "业务审核备注",
+    prop: 'diff_remark',
+    label: '业务审核备注',
     span: 12
-  },
-
-
-
-
-
+  }
 
 ]
 const listColumns = [
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "160px",
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '160px'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "100px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '100px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
-    width: "65px",
+    prop: 'apply_name',
+    label: '申请人',
+    width: '65px'
   },
   {
-    prop: "good_code",
-    label: "商品编码",
-    width: "150px",
+    prop: 'good_code',
+    label: '商品编码',
+    width: '150px'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
+    prop: 'good_name',
+    label: '商品名称'
   },
   // {
   //   prop: "class_cat",
@@ -104,35 +99,34 @@ const listColumns = [
   // },
 
   {
-    prop: "good_weight",
-    label: "商品总重量(g)",
-    width: "110px",
+    prop: 'good_weight',
+    label: '商品总重量(g)',
+    width: '110px'
   },
   {
-    prop: "diff_weight",
-    label: "工差总重量(g)",
-    width: "110px",
+    prop: 'diff_weight',
+    label: '工差总重量(g)',
+    width: '110px'
   },
 
- 
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "140px",
-    sortable: true,
+    prop: 'addtime',
+    label: '创建时间',
+    width: '140px',
+    sortable: true
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "52px",
-    _slot_: "operation",
-  },
+    width: '52px',
+    _slot_: 'operation'
+  }
 ]
 const statusOptions = [
-  { id: "1", label: "待业务部门审核" },
-        { id: "2", label: "工差单审核完成" },
-];
+  { id: '1', label: '待业务部门审核' },
+  { id: '2', label: '工差单审核完成' }
+]
 
-export { columns, statusOptions,listColumns }
+export { columns, statusOptions, listColumns }

src/views/standingBook/components/detail6/columns.js

@@ -1,59 +1,57 @@
 const columns = [
   {
-    prop: "project_name",
-    label: "项目名称",
+    prop: 'project_name',
+    label: '项目名称',
     span: 12
   },
   {
-    prop: "platform_name",
-    label: "所属平台",
+    prop: 'platform_name',
+    label: '所属平台',
     span: 12
   },
-  
- 
+
   {
-    prop: "company",
-    label: "销售方公司",
-    _slot_: "company",
+    prop: 'company',
+    label: '销售方公司',
+    _slot_: 'company'
   },
   {
-    prop: "khName",
-    label: "购买方公司",
-    _slot_: "khName",
+    prop: 'khName',
+    label: '购买方公司',
+    _slot_: 'khName'
   },
   {
-    prop: "arrtime",
-    label: "要求到货时间",
+    prop: 'arrtime',
+    label: '要求到货时间',
     span: 12
   },
-  
+
   {
-    prop: "endtime",
-    label: "竞价截止时间",
+    prop: 'endtime',
+    label: '竞价截止时间',
     span: 12
     // _slot_: "wsm",
   },
-  
+
   {
-    prop: "budget_total",
-    label: "项目总预算(元)",
-    _slot_: "budget_total",
+    prop: 'budget_total',
+    label: '项目总预算(元)',
+    _slot_: 'budget_total',
     span: 12
   },
- 
- 
+
   {
-    prop: "use_desc",
-    label: "项目用途",
+    prop: 'use_desc',
+    label: '项目用途',
     span: 12
   },
   {
-    prop: "ladder",
-    label: "商品要求",
-    _slot_: "ladder",
+    prop: 'ladder',
+    label: '商品要求',
+    _slot_: 'ladder',
     span: 24
 
-  },
+  }
   // {
   //   prop: "good_num",
   //   label: "采购总数量",
@@ -94,8 +92,8 @@ const columns = [
   // },
 ]
 const statusOptions = [
-  { value: "1", label: "竞品" },
-        { value: "2", label: "竞聘" },
-];
+  { value: '1', label: '竞品' },
+  { value: '2', label: '竞聘' }
+]
 
-export { columns, statusOptions, }
+export { columns, statusOptions }

src/views/standingBook/components/detail7/columns.js

@@ -1,179 +1,173 @@
 const columns = [
   {
-    prop: "infoNo",
-    label: "竞价单编号",
+    prop: 'infoNo',
+    label: '竞价单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
     span: 5
   },
 
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "departinfo",
-    label: "创建人",
-    _slot_: "departinfo",
+    prop: 'departinfo',
+    label: '创建人',
+    _slot_: 'departinfo',
     span: 7
   },
   {
-    prop: "company",
-    label: "销售方公司",
-    _slot_: "company",
+    prop: 'company',
+    label: '销售方公司',
+    _slot_: 'company'
   },
   {
-    prop: "khName",
-    label: "购买方公司",
-    _slot_: "khName",
+    prop: 'khName',
+    label: '购买方公司',
+    _slot_: 'khName'
   },
   {
-    prop: "platform_name",
-    label: "所属平台",
+    prop: 'platform_name',
+    label: '所属平台',
     span: 12
   },
   {
-    prop: "endtime",
-    label: "竞价截止时间",
+    prop: 'endtime',
+    label: '竞价截止时间',
     span: 6
   },
   {
-    prop: "is_project",
-    label: "竞价类型",
+    prop: 'is_project',
+    label: '竞价类型',
     span: 6,
-    _slot_: "is_project",
+    _slot_: 'is_project'
 
   },
   {
-    prop: "arrival_time",
-    label: "到货日期",
+    prop: 'arrival_time',
+    label: '到货日期',
     span: 6
   },
   {
-    prop: "is_addrs",
-    label: "是否多地",
-    _slot_: "is_addrs",
+    prop: 'is_addrs',
+    label: '是否多地',
+    _slot_: 'is_addrs',
     span: 6
 
   },
   {
-    prop: "budget_price",
-    label: "预算单价",
-    _slot_:"budget_price",
+    prop: 'budget_price',
+    label: '预算单价',
+    _slot_: 'budget_price',
     span: 6
   },
   {
-    prop: "num",
-    label: "数量",
+    prop: 'num',
+    label: '数量',
     span: 6
   },
   {
-    prop: "brand",
-    label: "品牌",
+    prop: 'brand',
+    label: '品牌',
     span: 6
   },
   {
-    prop: "is_custom",
-    label: "是否定制",
-    _slot_: "is_custom",
+    prop: 'is_custom',
+    label: '是否定制',
+    _slot_: 'is_custom',
     span: 6
   },
   {
-    prop: "total_weight",
-    label: "重量(g)",
+    prop: 'total_weight',
+    label: '重量(g)',
     span: 6
   },
   {
-    prop: "unit",
-    label: "单位(个)",
+    prop: 'unit',
+    label: '单位(个)',
     span: 6
   },
   {
-    prop: "cat_id",
-    label: "商品分类",
-    _slot_: "cat_id",
+    prop: 'cat_id',
+    label: '商品分类',
+    _slot_: 'cat_id',
     span: 12
   },
   {
-    prop: "good_name",
-    label: "商品名称",
+    prop: 'good_name',
+    label: '商品名称',
     span: 12
   },
   {
-    prop: "cost_desc",
-    label: "工艺说明",
+    prop: 'cost_desc',
+    label: '工艺说明',
     span: 12
   },
-  
+
   {
-    prop: "use_desc",
-    label: "产品用途",
+    prop: 'use_desc',
+    label: '产品用途',
     span: 12
   },
   {
-    prop: "specinfo",
-    label: "规格",
-    _slot_: "specinfo",
+    prop: 'specinfo',
+    label: '规格',
+    _slot_: 'specinfo',
 
     span: 12
   },
   {
-    prop: "config",
-    label: "配置要求",
+    prop: 'config',
+    label: '配置要求',
     span: 12
   },
   {
-    prop: "specs_weight",
-    label: "金属克重(g)",
+    prop: 'specs_weight',
+    label: '金属克重(g)',
     span: 6
   },
   {
-    prop: "is_gold_price",
-    label: "启用金价",
-    _slot_: "is_gold_price",
+    prop: 'is_gold_price',
+    label: '启用金价',
+    _slot_: 'is_gold_price',
     span: 6
   },
   {
-    prop: "other_config",
-    label: "其他配置要求",
+    prop: 'other_config',
+    label: '其他配置要求',
     span: 12
   },
   {
-    prop: "metal_name",
-    label: "金属种类",
+    prop: 'metal_name',
+    label: '金属种类',
     span: 6
   },
   {
-    prop: "gold_price",
-    label: "当前金价",
-    _slot_:"gold_price",
+    prop: 'gold_price',
+    label: '当前金价',
+    _slot_: 'gold_price',
     span: 6
   },
-  
 
-  
   {
-    prop: "remark",
-    label: "商品备注",
+    prop: 'remark',
+    label: '商品备注',
     span: 12
   },
   {
-    prop: "good_img",
-    label: "商品图片",
-    _slot_: "good_img",
+    prop: 'good_img',
+    label: '商品图片',
+    _slot_: 'good_img',
 
     span: 12
-  },
-  
-
-  
+  }
 
 ]
 
-
-export { columns}
+export { columns }

src/views/standingBook/components/detail7/main.vue

@@ -158,14 +158,24 @@ export default {
   data() {
     return {
       options: [
-        { id: "0", label: "待发布竞标" },
-        { id: "1", label: "招标进行中" },
-        { id: "2", label: "招标已结束" },
-        { id: "3", label: "待选择商品" },
-        { id: "4", label: "已选商品待下单" },
-        { id: "5", label: "已成功转单" },
-        { id: "6", label: "已取消转单" },
-        { id: "7", label: "招标已暂停" },
+        // { id: "0", label: "待发布竞标" },
+        // { id: "1", label: "招标进行中" },
+        // { id: "2", label: "招标已结束" },
+        // { id: "3", label: "待选择商品" },
+        // { id: "4", label: "已选商品待下单" },
+        // { id: "5", label: "已成功转单" },
+        // { id: "6", label: "已取消转单" },
+        // { id: "7", label: "招标已暂停" },
+
+          /*  CHANGE:STATUS **/
+          { id: "0", label: "待发布竞标" },
+          { id: "1", label: "招标进行中" },
+          { id: "2", label: "招标已结束" },
+          { id: "3", label: "待业务下单" },
+          // { id: "4", label: "已选商品待下单" },
+          { id: "5", label: "已成功转单" },
+          { id: "6", label: "已取消转单" },
+          { id: "7", label: "招标已暂停" },
       ],
       is_project_options: [
         { value: "0", label: "非项目" },

src/views/standingBook/components/detail8/columns.js

@@ -1,268 +1,275 @@
 
 const columns = [
   {
-    prop: "bargainNo",
-    label: "议价单编号",
+    prop: 'bargainNo',
+    label: '议价单编号',
     span: 6
   },
 
   {
-    prop: "bidsNo",
-    label: "反馈商品编号",
+    prop: 'bidsNo',
+    label: '反馈商品编号',
     span: 6
   },
   {
-    prop: "infoNo",
-    label: "竞价单编号",
+    prop: 'infoNo',
+    label: '竞价单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "creater",
-    label: "创建人",
+    prop: 'creater',
+    label: '创建人',
     span: 6
   },
 
   {
-    prop: "is_addrs",
-    label: "是否多地",
-    _slot_: "is_addrs",
+    prop: 'is_addrs',
+    label: '是否多地',
+    _slot_: 'is_addrs',
     span: 4
   },
   {
-    prop: "is_custom",
-    label: "是否定制",
-    _slot_: "is_custom",
+    prop: 'is_custom',
+    label: '是否定制',
+    _slot_: 'is_custom',
     span: 4
   },
   {
-    prop: "good_num",
-    label: "购买数量",
-    _slot_: "good_num",
+    prop: 'good_num',
+    label: '购买数量',
+    _slot_: 'good_num',
     span: 4
   },
   {
-    prop: "rate_status",
-    label: "预计通过节点",
-    _slot_: "rate_status",
+    prop: 'rate_status',
+    label: '预计通过节点',
+    _slot_: 'rate_status',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "添加时间",
+    prop: 'addtime',
+    label: '添加时间',
     span: 6
   },
   {
-    prop: "origin_addr",
-    label: "产地",
+    prop: 'origin_addr',
+    label: '产地',
     span: 6
   },
   {
-    prop: "result_info",
-    label: "议价原因",
+    prop: 'result_info',
+    label: '议价原因',
     span: 12
   },
   {
-    prop: "bargain_remark",
-    label: "议价备注",
+    prop: 'bargain_remark',
+    label: '议价备注',
     span: 24
   },
 
   {
-    prop: "sale_price",
-    label: "议价前售价",
-    _slot_:"sale_price",
+    prop: 'sale_price',
+    label: '议价前售价',
+    _slot_: 'sale_price',
     append: '元',
     span: 6
   },
   {
-    prop: "after_price",
-    label: "议价后售价",
-    _slot_:"after_price",
+    prop: 'after_price',
+    label: '议价后售价',
+    _slot_: 'after_price',
     append: '元',
     span: 6
   },
 
   {
-    prop: "cost_before_price",
-    label: "议价前工艺费",
-    _slot_:"cost_before_price",
+    prop: 'cost_before_price',
+    label: '议价前工艺费',
+    _slot_: 'cost_before_price',
     append: '元',
     span: 6
   },
 
   {
-    prop: "cost_after_price",
-    label: "议价后工艺费",
-    _slot_:"cost_after_price",
+    prop: 'cost_after_price',
+    label: '议价后工艺费',
+    _slot_: 'cost_after_price',
     append: '元',
     span: 6
   },
 
   {
-    prop: "before_rate",
-    label: "议价前毛利率",
-    _slot_:"before_rate",
+    prop: 'before_rate',
+    label: '议价前毛利率',
+    _slot_: 'before_rate',
     append: '%',
     span: 12
   },
   {
-    prop: "after_rate",
-    label: "议价后毛利率",
-    _slot_:"after_rate",
+    prop: 'after_rate',
+    label: '议价后毛利率',
+    _slot_: 'after_rate',
     append: '%',
     span: 12
   },
   {
-    prop: "cert_fee",
-    label: "成本证书费",
-    _slot_:"cert_fee",
+    prop: 'cert_fee',
+    label: '成本证书费',
+    _slot_: 'cert_fee',
     append: '元',
     span: 6
   },
   {
-    prop: "pakge_fee",
-    label: "成本包装费",
-    _slot_:"pakge_fee",
+    prop: 'pakge_fee',
+    label: '成本包装费',
+    _slot_: 'pakge_fee',
     append: '元',
     span: 6
   },
   {
-    prop: "cost_fee",
-    label: "成本工艺费",
-    _slot_:"cost_fee",
+    prop: 'cost_fee',
+    label: '成本工艺费',
+    _slot_: 'cost_fee',
     append: '元',
     span: 6
   },
   {
-    prop: "mark_fee",
-    label: "成本加标费",
-    _slot_:"mark_fee",
+    prop: 'mark_fee',
+    label: '成本加标费',
+    _slot_: 'mark_fee',
     append: '元',
     span: 6
   },
 
   {
-    prop: "demo_fee",
-    label: "成本打样费",
-    _slot_:"demo_fee",
+    prop: 'demo_fee',
+    label: '成本打样费',
+    _slot_: 'demo_fee',
     append: '元',
     span: 6
   },
   {
-    prop: "open_fee",
-    label: "成本开模费",
-    _slot_:"open_fee",
+    prop: 'open_fee',
+    label: '成本开模费',
+    _slot_: 'open_fee',
     append: '元',
     span: 6
   },
   {
-    prop: "delivery_fee",
-    label: "成本物流费",
-    _slot_:"delivery_fee",
+    prop: 'delivery_fee',
+    label: '成本物流费',
+    _slot_: 'delivery_fee',
     append: '元',
     span: 6
   },
   {
-    prop: "nake_fee",
-    label: "成本裸价",
-    _slot_:"nake_fee",
+    prop: 'nake_fee',
+    label: '成本裸价',
+    _slot_: 'nake_fee',
     append: '元',
     span: 6
   },
   {
-    prop: "total_fee",
-    label: "采购成本合计",
-    _slot_:"total_fee",
+    prop: 'total_fee',
+    label: '采购成本合计',
+    _slot_: 'total_fee',
     append: '元',
     span: 24
-  },
+  }
 
 ]
 
-//是否定制
+// 是否定制
 const options1 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
-//专属类型
+// 专属类型
 const options2 = [
-  { id: "0", name: "非泰康" },
-  { id: "1", name: "泰康" },
+  { id: '0', name: '非泰康' },
+  { id: '1', name: '泰康' }
 ]
-//销售权限
+// 销售权限
 const options3 = [
-  { id: "0", name: "无销售权限" },
-  { id: "1", name: "有销售权限" },
+  { id: '0', name: '无销售权限' },
+  { id: '1', name: '有销售权限' }
 ]
 
-//是否库存品
+// 是否库存品
 const options4 = [
-  { id: "0", name: "非库存品" },
-  { id: "1", name: "库存品" },
+  { id: '0', name: '非库存品' },
+  { id: '1', name: '库存品' }
 ]
-//是否启用实时金价
+// 是否启用实时金价
 const options5 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
-//供货区域
+// 供货区域
 const options6 = [
-  { id: "1", name: "全国" },
-  { id: "2", name: "全国除偏远" },
+  { id: '1', name: '全国' },
+  { id: '2', name: '全国除偏远' }
 ]
-//是否启用阶梯
+// 是否启用阶梯
 const options7 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
-//有无工差
+// 有无工差
 const options8 = [
-  { id: "0", name: "无工差" },
-  { id: "1", name: "有工差" },
+  { id: '0', name: '无工差' },
+  { id: '1', name: '有工差' }
 ]
-//配置要求
-const options9 = ["证书", "包装盒", "绒布袋", "标签", "其他"]
-//付款方式
+// 配置要求
+const options9 = ['证书', '包装盒', '绒布袋', '标签', '其他']
+// 付款方式
 const options10 = [
-  { id: "0", name: "现结" },
-  { id: "1", name: "月清" },
-  { id: "2", name: "双月清" },
+  { id: '0', name: '现结' },
+  { id: '1', name: '月清' },
+  { id: '2', name: '双月清' }
 ]
-//发货方式
+// 发货方式
 const options11 = [
-  { id: "0", name: "公司自提" },
-  { id: "1", name: "供应商包邮" },
+  { id: '0', name: '公司自提' },
+  { id: '1', name: '供应商包邮' }
 ]
 
 const options12 = [
-  { id: "0", name: "一地" },
-  { id: "1", name: "多地" },
+  { id: '0', name: '一地' },
+  { id: '1', name: '多地' }
 ]
 const statusList = [
-  { id: "0", label: "待业务主管审核", type: "warning" },
-  { id: "1", label: "业务主管通过", type: "success" },
-  { id: "2", label: "待财务专员审批", type: "warning" },
-  { id: "3", label: "业务主管驳回", type: "danger" },
-  { id: "4", label: "待财务主管审核", type: "warning" },
-  // { id: "5", label: "专员驳回", type: "" },
-  { id: "6", label: "财务主管通过", type: "success" },
-  { id: "7", label: "待BOSS审批", type: "warning" },
-  { id: "8", label: "财务主管驳回", type: "danger" },
-  { id: "9", label: "boss通过", type: "success" },
-  { id: "10", label: "boss越线通过", type: "" },
-  { id: "11", label: "boss驳回", type: "danger" },
+  // { id: '0', label: '待业务主管审核', type: 'warning' },
+  // { id: '1', label: '业务主管通过', type: 'success' },
+  // { id: '2', label: '待财务专员审批', type: 'warning' },
+  // { id: '3', label: '业务主管驳回', type: 'danger' },
+  // { id: '4', label: '待财务主管审核', type: 'warning' },
+  // // { id: "5", label: "专员驳回", type: "" },
+  // { id: '6', label: '财务主管通过', type: 'success' },
+  // { id: '7', label: '待BOSS审批', type: 'warning' },
+  // { id: '8', label: '财务主管驳回', type: 'danger' },
+  // { id: '9', label: 'boss通过', type: 'success' },
+  // { id: '10', label: 'boss越线通过', type: '' },
+  // { id: '11', label: 'boss驳回', type: 'danger' }
+
+  /* CHANGE:STATUS **/
+  { id: '0', label: '待业务主管审核', type: '' },
+  { id: '1', label: '业务主管已通过', type: 'success' },
+  { id: '2', label: '业务主管已驳回', type: 'danger' },
+  { id: '3', label: '业务主管越线通过', type: 'warning' },
+  { id: '4', label: '取消议价', type: 'info' }
 ]
 const rate_status_options = [
   { id: '0', label: '全部无法通过' },
   { id: '1', label: '业务主管通过' },
   { id: '2', label: '财务主管通过' },
-  { id: '3', label: 'boss通过' },
+  { id: '3', label: 'boss通过' }
 ]
 
 export { columns, options1,
@@ -276,7 +283,7 @@ export { columns, options1,
   options9,
   options10,
   options11,
-  options12, 
+  options12,
   statusList,
   rate_status_options
-}
+}

src/views/standingBook/components/detail9/columns.js

@@ -1,57 +1,54 @@
 const columns = [
   {
-    prop: "bk_code",
-    label: "申请编码",
-    span: 6,
+    prop: 'bk_code',
+    label: '申请编码',
+    span: 6
   },
 
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    span: 6,
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    span: 6
   },
   {
-    prop: "apply_name",
-    label: "申请人",
-    span: 6,
+    prop: 'apply_name',
+    label: '申请人',
+    span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 6,
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
   },
   {
-    prop: "good_num",
-    label: "采购数量",
-    span: 6,
+    prop: 'good_num',
+    label: '采购数量',
+    span: 6
   },
   {
-    prop: "lasttime",
-    label: "最晚入库时间",
-    span: 6,
+    prop: 'lasttime',
+    label: '最晚入库时间',
+    span: 6
   },
   {
-    prop: "file_url",
-    label: "附件",
-    _slot_: "file_url",
-    span: 12,
+    prop: 'file_url',
+    label: '附件',
+    _slot_: 'file_url',
+    span: 12
   },
 
   {
-    prop: "remark",
-    label: "备注",
+    prop: 'remark',
+    label: '备注',
     span: 24
-  },
+  }
 
 ]
 const statusOptions = [
-  { value: "1", label: "待采购反馈" },
-  { value: "2", label: "已生成采购单" },
-  {
-    value: "4",
-    label: "已取消采购",
-  },
-];
+  { value: '1', label: '待采购反馈' },
+  { value: '2', label: '已生成采购单' },
+  { value: '4', label: '已取消采购' }
+]
 
-export { columns, statusOptions, }
+export { columns, statusOptions }

src/views/standingBook/detail.vue

@@ -93,6 +93,13 @@
                 <detail13 :queryId="tableData.orderCode"> </detail13>
               </el-collapse-item>
             </div>
+
+            <div id="detail19" v-if="tableData.orderCode">
+              <el-collapse-item title="发货工单" name="19" v-if="newTime !== ''">
+                <detail19 :queryId="tableData.orderCode"></detail19>
+              </el-collapse-item>
+            </div>
+
             <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
             <div id="detail14" v-if="tableData.orderCode">
               <el-collapse-item title="销售退货单" name="14" v-if="newTime !== ''">
@@ -160,6 +167,7 @@ import detail15 from "./components/detail15/main.vue";
 import detail16 from "./components/detail16/main.vue";
 import detail17 from "./components/detail17/main.vue";
 import detail18 from "./components/detail18/main.vue";
+import detail19 from "./components/detail19/main.vue";
 
 export default {
   name: "test",
@@ -183,6 +191,7 @@ export default {
     detail16,
     detail17,
     detail18,
+    detail19
   },
 
   computed: {
@@ -229,7 +238,6 @@ export default {
     for (let i = 1; i < 20; i++) {
       this.activeNames.push(i + "");
     }
-
     this.initData();
   },
   methods: {
@@ -311,9 +319,11 @@ export default {
       (bargainNo ?? "") != ""
         ? arr.push({ tar: "#detail8", title: "议价单" })
         : (flag = false);
+
       (purchease_id ?? "") != ""
         ? arr.push({ tar: "#detail9", title: "备货申请单" })
         : (flag = false);
+
       (sale_id ?? "") != ""
         ? arr.push({ tar: "#detail10", title: "销售订单" })
         : (flag = false);
@@ -329,6 +339,11 @@ export default {
       (orderCode ?? "") != ""
         ? arr.push({ tar: "#detail13", title: "销售售后退货单" })
         : (flag = false);
+
+        (orderCode ?? "") != ""
+        ? arr.push({ tar: "#detail19", title: "发货工单" })
+        : (flag = false);
+
       //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
       (orderCode ?? "") != ""
         ? arr.push({ tar: "#detail14", title: "销售退货单" })