Merge branch 'sit'

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

@@ -26,4 +26,8 @@ export default {
   orderinreturn: (data, params) => http(api + "orderinreturn", data, "post", params),
   // 发货单状态修改
   orderinstatus: (data, params) => http(api + "orderinstatus", data, "post", params),
+  // 采返商品详情
+  re_detail: (data, params) => http(api + "goodzxinfo", data, "post", params),
+  //商品成本详情
+  cost_detail: (data, params) => http(api + "goodupinfo", data, "post", params),
 };

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

@@ -18,7 +18,8 @@ export default {
   salefee: (data, params) => http(api + "salefee", data, "post", params),
   // 新建发货申请单
   saleout: (data, params) => http(api + "saleoutadd", data, "post", params),
-
+  //延时发货追加地址
+  saleaddr: (data, params) => http(api + "saleaddr", data, "post", params),
 
 
 

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

@@ -26,4 +26,6 @@ export default {
   uselist: (data, params) => http(api + "uselist", data, "post", params),
   //添加其他业管、PO、承诺回款时间
   saleaddother: (data, params) => http(api + "saleaddother", data, "post", params),
+  //延时发货追加地址
+  saleaddr: (data, params) => http(api + "saleaddr", data, "post", params),
 };

src/apis/url-config.js

@@ -1,5 +1,4 @@
 import { api, ding, webUrl } from '@/config'
-console.log(webUrl);
 const { userApi, baseApi } = api
 const { CorpId, AgentId } = ding
 export default {

src/assets/js/btnList.js

@@ -80,6 +80,8 @@ const btnList = [
   { code: "079", name: "下线商品" },
   { code: "080", name: "库管发货" },
   { code: "081", name: "添加发货申请" },
+  { code: "082", name: "添加工差" },
+  { code: "083", name: "设置退货仓库" },
   // { code: "082", name: "发货申请" },
 
 ];

src/views/goodStore/goodsCost/columns.js

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

src/views/goodStore/goodsCost/index.vue

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

src/views/purchaseIn/purchaseDiffOrder/addEditModel.vue

@@ -26,16 +26,36 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="商品总克重" prop="weight">
-              <el-input v-model="ruleForm.weight" disabled>
-                <template slot="append">g</template></el-input
-              >
+              <digital-input
+                :values="ruleForm.weight"
+                :placeholder="'商品总克重'"
+                :min="0"
+                :disabled="true"
+                :max="100000000000"
+                :position="'right'"
+                :precision="3"
+                :size="'mini'"
+                :controls="false"
+                :append="'g'"
+                @reschange="number_change($event, 'weight')"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工差总克重" prop="num">
-              <el-input v-model="ruleForm.num" :disabled="isDetail"
-                ><template slot="append">g</template></el-input
-              >
+              <digital-input
+                :values="ruleForm.num"
+                :placeholder="'工差总克重'"
+                :min="0"
+                :disabled="false"
+                :max="ruleForm.weight"
+                :position="'right'"
+                :precision="3"
+                :size="'mini'"
+                :controls="false"
+                :append="'g'"
+                @reschange="number_change($event, 'num')"
+              />
             </el-form-item>
           </el-col>
 
@@ -137,21 +157,21 @@ export default {
         this.$message.warning(res.message);
       }
     },
+    async number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { loginName, goods_class, good_name, cgdNo, weight } =
-            this.sitem;
+          const { cgdNo, weight } = this.sitem;
           this.ruleForm = {
             cgdNo: cgdNo || "",
-            loginName: loginName || "", // 账号
-            goods_class: goods_class || "",
-            good_name: good_name || "",
             weight: weight || "",
-            num: "",
+            num: "0",
           };
         }
       });

src/views/purchaseIn/purchaseOrder/components/tolerance.vue

@@ -1,6 +1,7 @@
 <template>
   <span>
     <el-button
+      v-show="isshow && showBtn"
       type="primary"
       :size="'mini'"
       class="fr"
@@ -9,7 +10,7 @@
       >填写总工差</el-button
     >
     <add-edit-model
-      :sitem="sitem"
+      :sitem="showItem"
       :show-model="diffAdd"
       @refresh="initData"
       @cancel="diffAdd = false"
@@ -19,21 +20,70 @@
 
 <script>
 import addEditModel from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
-
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+import resToken from "@/mixins/resToken";
 export default {
+  name: "tolerance",
   components: {
     addEditModel,
   },
-  props: ["id", "sitem", "newTime"],
+  props: ["id", "sitem", "newTime", "showBtn"],
   mixins: [resToken],
   data() {
     return {
       diffAdd: false,
+      order_type: "",
+      spuCode: "",
+      is_noble: false,
+      isshow: false,
+      showItem:null,
+      cgdNo:"",
     };
   },
-  mounted: {
-    initData() {
-      console.log("34");
+  mounted() {
+    const { order_type, spuCode,cgdNo } = this.sitem;
+    this.order_type = order_type;
+    this.spuCode = spuCode;
+    this.cgdNo=cgdNo
+    // this.queryId = this.$route.query.id;
+    this.initData();
+  },
+
+  methods: {
+    async initData() {
+      // console.log("111111");
+      let res = {};
+      if (this.order_type === "1" || this.order_type === "2") {
+        res = await asyncRequest.cost_detail({ spuCode: this.spuCode });
+      } else {
+        res = await asyncRequest.re_detail({ spuCode: this.spuCode });
+      }
+
+      const { code, data, message } = res;
+      if (code === 0) {
+        const { cat_info, is_diff ,noble_weight} = data;
+        if (cat_info && cat_info.length > 0) {
+          cat_info.forEach((e) => {
+            if (e.id === "6") {
+              this.is_noble = true;
+            }
+          });
+        }
+        if (this.is_noble && is_diff === "1") {
+          this.isshow = true;
+          this.showItem={
+            cgdNo:this.cgdNo,
+            weight:noble_weight
+          }
+        }
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    showDiffAdd(){
+      // diffAdd = true
     },
   },
 };

src/views/purchaseIn/purchaseOrder/components/work-diff-table.vue

@@ -0,0 +1,334 @@
+<template>
+  <div class="work-diff-table">
+    <el-table
+      ref="addrForm"
+      :data="tableData"
+      border
+      :size="'mini'"
+      style="width: 100%"
+      row-key="key"
+    >
+      <el-table-column
+        show-overflow-tooltip
+        prop="orderCode"
+        label="采购单编号"
+        width="150"
+      />
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="outCode"
+        label="商品分类"
+        width="150"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="apply_name"
+        label="商品名称"
+        width="85"
+      />
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_name"
+        label="物流公司"
+        width="110"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_code"
+        label="物流单号"
+        width="160"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_fee"
+        label="预计物流费"
+        width="100"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="status"
+        label="状态"
+        width="80"
+      >
+        <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="sendtime"
+        label="发货时间"
+        min-width="170"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="send_num"
+        label="	发货数量"
+        width="80"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="check_num"
+        label="验收数量"
+        width="80"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="addr_info"
+        label="省市区"
+        min-width="170"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="addr"
+        label="收货地址"
+        min-width="170"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="contact"
+        label="联系人"
+        width="80"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="mobile"
+        label="联系电话"
+        width="110"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="wsm_supplier"
+        label="供应商"
+        min-width="220"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="wsm_supplierNo"
+        label="仓库供应商"
+        min-width="170"
+      />
+
+      <el-table-column fixed="right" width="80">
+        <template slot="header" slot-scope="scope">
+          <span>操作</span>
+        </template>
+
+        <template slot-scope="scope">
+          <el-tooltip
+            effect="dark"
+            content="查看"
+            v-if="!scope.row.edit"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="openHouseModal(scope.$index)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+   <script>
+import resToken from "@/mixins/resToken";
+// import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
+// import outOrderAddModel from "./out-order-add-model";
+// import addEdit from "@/views/sellOut/sellAfterApply/components/addEdit.vue";
+
+import { mapGetters } from "vuex";
+
+export default {
+  name: "workDiffTable",
+  mixins: [resToken],
+  props: ["newTime", "id", "sitem"],
+  //   components: { addEdit, outOrderAddModel },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+
+    // powers() {
+    //   let tran =
+    //     this.$store.getters.btnList.find(
+    //       (item) => item.menu_route == "workDiffTable"
+    //     ) || {};
+    //   if (tran && tran.action && tran.action.length > 0) {
+    //     return tran.action;
+    //   } else {
+    //     return [];
+    //   }
+    // },
+  },
+
+  data() {
+    return {
+      orderCode: "",
+      outCode: "",
+      // 状态
+      statusOptions: [
+        { id: "1", label: "已出库" },
+        { id: "2", label: "验收中" },
+        { id: "3", label: "验收完成" },
+      ],
+      showGoodsModel: false,
+      stock_code: "",
+      tableData: [],
+      loading: false,
+      queryId: "",
+      status: "",
+      showModel: null,
+      modelId: "",
+      modelItem: null,
+      s_sitem: null,
+    };
+  },
+  mounted() {
+    // console.log(this.sitem);
+    // console.log(this.sitem.bum);
+    this.initForm();
+  },
+  methods: {
+    refresh() {
+      this.$emit("refresh");
+    },
+    async initForm() {
+      // console.log("12");
+      this.status = "";
+      this.queryId = this.$route.query.id;
+      // this.rulesThis = this.rules;
+      this.resetForm();
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+     
+        // console.log(this.$refs.addrForm);
+        // if (this.$refs.addrForm) {
+        //   this.$refs.addrForm.resetFields();
+        //   this.$refs.addrForm.clearValidate();
+        const { purcheasediff } = this.sitem;
+           console.log(purcheasediff);
+        if (purcheasediff && purcheasediff.length > 0) {
+          this.tableData = JSON.parse(JSON.stringify(purcheasediff));
+        } else {
+          this.tableData = [];
+        }
+      });
+    },
+
+    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;
+      }
+    },
+    checkStockRow(index) {
+      let total = parseInt(this.stockForm.good_stock[index].usable_stock),
+        num = parseInt(this.stockForm.good_stock[index].num);
+      if (total === 0) {
+        this.$message.warning("该仓库已无该商品库存！不能销售！");
+        return;
+      } else {
+        if (num > total) {
+          this.$message.warning("销售数量不能大于可用库存！");
+          return;
+        } else {
+          this.stockForm.good_stock[index].edit = false;
+        }
+      }
+    },
+
+    openHouseModal() {
+      this.modelId = "add";
+      this.modelItem = this.sitem;
+      this.modelShowModel = true;
+    },
+
+    //省市区保存某一行
+    checkRow(rowIndex) {
+      this.$refs.addrForm.validate((valid) => {
+        if (valid) {
+          this.tableData[rowIndex].edit = false;
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    // 省市区删除行操作
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    // async submitForm() {
+    //   await this.$refs.ruleForm.validate(async (valid) => {
+    //     if (valid) {
+    //       this.loading = true;
+    //       const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
+    //       let model = {
+    //         id: this.queryId,
+    //         order_addr: [],
+    //       };
+    //       order_addr.forEach((v2) => {
+    //         let model2 = {
+    //           post_fee: v2.post_fee,
+    //           id: v2.id,
+    //         };
+    //         model.order_addr.push(model2);
+    //       });
+    //       let res = await asyncRequest.salefee(model);
+    //       this.loading = false;
+    //       if (res && res.code === 0) {
+    //         this.$notify.success({
+    //           title: "反馈物流费用成功！",
+    //           message: "",
+    //         });
+    //         this.showModelThis = false;
+    //         // 刷新
+    //         this.$emit("refresh");
+    //       } else if (res && res.code >= 100 && res.code <= 104) {
+    //         await this.logout();
+    //       } else {
+    //         this.$message.warning(res.message);
+    //       }
+    //     } else {
+    //       console.log("error submit!!");
+    //       return false;
+    //     }
+    //   });
+    // },
+    openModal(code, sitem, outcode) {
+      console.log(sitem);
+      this.s_sitem = sitem;
+      this.modelId = code;
+      this.showModel = true;
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+</style>

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -4,7 +4,7 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
+      <p>{{ status }}---{{ powers }}</p>
       <div class="detail-page-title">
         <span>采购单编号：</span
         ><span
@@ -12,14 +12,12 @@
 
           <!-- ---{{ sitem.bkcode }} -->
         </span>
-
-        <!-- v-if="
-            (status === '1' || status === '2') &&
-            powers.some((item) => item == '007') &&
-            sitem &&
-            sitem.noble_name
-          " -->
-
+        <tolerance
+          :newTime="newTime"
+          v-if="newTime !== ''"
+          :sitem="sitem"
+          :showBtn="status === '1' && powers.some((item) => item == '082')"
+        />
         <!-- <el-button
           type="primary"
           :size="'mini'"
@@ -149,9 +147,12 @@
             <el-collapse-item
               title="工差单"
               name="4"
-              v-if="sitem && sitem.noble_name"
             >
-              <work-diff-table />
+              <work-diff-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :sitem="sitem"
+              />
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
@@ -175,14 +176,17 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import orderInTable from "./components/order-in-table";
+import workDiffTable from "./components/work-diff-table";
 import ShowDataTableColumns from "./components/ShowDataTableColumns";
 import { order_type_options, statusOptions } from "./columns";
-
+import tolerance from "./components/tolerance";
 export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
     orderInTable,
+    tolerance,
+    workDiffTable,
   },
 
   computed: {
@@ -200,6 +204,7 @@ export default {
   },
   data() {
     return {
+      hasdiff: false,
       activeTabs: "1",
       ShowDataTableColumns: ShowDataTableColumns,
       isMetal: false,

src/views/sellOut/bargainList/columns.js

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

src/views/sellOut/bargainList/detail.vue

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

src/views/sellOut/returnOrder/columns.js

@@ -4,23 +4,23 @@ export default [
     label: "售后退货单编号",
     width: "160"
   },
-  {
-    prop: "returnCode",
-    label: "售后申请单编号",
-    width: "160"
+  // {
+  //   prop: "returnCode",
+  //   label: "售后申请单编号",
+  //   width: "160"
 
-  },
-  {
-    prop: "outCode",
-    label: "发货申请单编号",
-    width: "160"
-  },
+  // },
+  // {
+  //   prop: "outCode",
+  //   label: "发货申请单编号",
+  //   width: "160"
+  // },
  
-  {
-    prop: "orderCode",
-    label: "销售订单编号",
-    width: "160"
-  },
+  // {
+  //   prop: "orderCode",
+  //   label: "销售订单编号",
+  //   width: "160"
+  // },
   {
     prop: "good_code",
     label: "商品属性编号",
@@ -40,12 +40,12 @@ export default [
     width: "140"
 
   },
-  {
-    prop: "customer_name",
-    label: "客户名称",
-    width: "140"
+  // {
+  //   prop: "customer_name",
+  //   label: "客户名称",
+  //   width: "140"
 
-  },
+  // },
   
   {
     prop: "return_num",

src/views/sellOut/returnOrder/index.vue

@@ -230,7 +230,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        order_type: "1", //订单类型1为销售 2为咨询
+        order_type: "", //订单类型1为销售 2为咨询
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
@@ -281,7 +281,7 @@ export default {
         end: "", //
         status: "", //状态节点
         // --
-        order_type: "1", //订单类型1为销售 2为咨询
+        order_type: "", //订单类型1为销售 2为咨询
         page: 1, // 页码
         size: 15, // 每页显示条数
       };

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

@@ -83,11 +83,11 @@
         label="发货时间"
         width="145"
       />
-      <el-table-column fixed="right" width="100">
+      <el-table-column fixed="right" width="150">
         <template slot="header" slot-scope="scope">
           <span>操作</span>
           <el-tooltip
-            style="margin: 3px 0 0 0"
+            style="margin: 3px 0 0 8px"
             effect="dark"
             class="fr"
             v-if="
@@ -104,7 +104,33 @@
               @click="openHouseModal()"
             ></i>
           </el-tooltip>
-
+          <el-tooltip
+            class="fr"
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            content="导入收货地址"
+            placement="top"
+          >
+            <i
+              class="el-icon-upload2 tb-icon"
+              style="color: #63cbe7"
+              @click="addrmodel = true"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            class="fr"
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            content="下载收货地址模板"
+            placement="top"
+          >
+            <a class="downloadAddr" href="./static/收货地址模板.xlsx">
+              <i
+                class="el-icon-download tb-icon"
+                style="color: #63cbe7; margin: 0"
+              ></i>
+            </a>
+          </el-tooltip>
           <el-tooltip
             style="margin: 3px 0 0 0"
             effect="dark"
@@ -145,6 +171,11 @@
       @refresh="refresh"
       @closeModel="modelShowModel = false"
     />
+    <in-addr-model
+      :show-model="addrmodel"
+      @cancel="addrmodel = false"
+      @refresh="addrRefresh"
+    />
 
     <add-model
       :id="returnId"
@@ -171,13 +202,14 @@ 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-addr-model";
 import { mapGetters } from "vuex";
 
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
   props: ["newTime", "id", "sitem"],
-  components: { outOrderAddModel, addModel },
+  components: { outOrderAddModel, addModel, inAddrModel },
   watch: {
     newTime: function (val) {
       if (val) {
@@ -206,6 +238,7 @@ export default {
       orderCode: "",
       outCode: "",
       is_all: false,
+      addrmodel: false,
       // 状态
       statusOptions: [
         { id: "0", label: "待公司采购" },
@@ -272,7 +305,58 @@ export default {
         }
       });
     },
+    async addrRefresh(e) {
+      if (!this.loading) {
+        this.loading = true;
+        const { arrive_time, orderCode, wsend_num } = this.sitem;
+        const { list } = e;
+        console.log(list);
+        let t_num = 0,
+          add_num = 0;
+        // this.tableData.forEach((a) => {
+        //   t_num += a.receipt_quantity * 1;
+        // });
+        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;
+        }
+        let res = await asyncRequest.saleaddr(model);
+        this.loading = false;
+        if (res && res.code === 0) {
+          this.$notify.success({
+            title: "反馈物流费用成功！",
+            message: "",
+          });
+          this.showModelThis = false;
+          // 刷新
+          this.$emit("refresh");
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
+      }
 
+      // this.tableData = [];
+      // this.tableData.push(...list);
+    },
     editRow(index) {
       let findex = this.stockForm.good_stock.findIndex((v) => v.edit === true);
       if (findex !== -1) {

src/views/sellOut/sellAfterApply/components/purchase_exam.vue

@@ -18,6 +18,7 @@
             placeholder="请选择审核状态"
             style="width: 100%"
             :size="'mini'"
+            :disabled="!(status == '2' && powers.some((item) => item == '040'))"
             @change="statusChange"
           >
             <el-option
@@ -35,6 +36,7 @@
           <el-select
             v-model="ruleForm.is_post"
             style="width: 100%"
+            :disabled="!(status == '2' && powers.some((item) => item == '040'))"
             placeholder="是否承担物流费"
             :size="'mini'"
           >
@@ -51,6 +53,7 @@
       <el-col :span="ruleForm.status === '1' ? 12 : 18">
         <el-form-item
           label="审核备注"
+          :disabled="!(status == '2' && powers.some((item) => item == '040'))"
           v-if="ruleForm.status === '0'"
           prop="remark"
         >
@@ -65,7 +68,10 @@
             show-word-limit
           />
         </el-form-item>
-        <el-form-item class="fr">
+        <el-form-item
+          class="fr"
+          v-if="status == '2' && powers.some((item) => item == '040')"
+        >
           <el-button
             v-if="!isDetail"
             :size="'mini'"

src/views/sellOut/sellAfterApply/detail.vue

@@ -4,7 +4,7 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
+      <p>{{ status }}---{{ powers }}</p>
 
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
@@ -101,10 +101,11 @@
               title="采购审核"
               name="4"
               v-if="
-                (status == '2' && powers.some((item) => item == '040')) ||
-                status == '3' ||
-                status == '4' ||
-                status == '5'
+                sitem.order_type !== '1' &&
+                (status == '2' ||
+                  status == '3' ||
+                  status == '4' ||
+                  status == '5')
               "
             >
               <purchase-exam
@@ -115,13 +116,13 @@
               />
             </el-collapse-item>
             <el-collapse-item
-              title="物流反馈"
+              title="设置退货仓库"
               name="4"
               v-if="
-                (status == '2' && powers.some((item) => item == '040')) ||
-                status == '3' ||
-                status == '4' ||
-                status == '5'
+                sitem.order_type !== '1' && sitem.is_receive==='1'&&
+                ((status == '3' && powers.some((item) => item == '083')) ||
+                  status == '4' ||
+                  status == '5')
               "
             >
               <express-feedback
@@ -131,6 +132,13 @@
                 @refresh="initData"
               ></express-feedback>
             </el-collapse-item>
+            <el-collapse-item
+              title="用户退货"
+              name="4"
+              v-if="sitem.order_type !== '1' && status == '4'"
+            >
+              用户退货
+            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2">
@@ -153,7 +161,6 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import ExpressFeedback from "./components/express_feedback";
-
 import { sellshowColumns } from "./columns";
 import purchaseExam from "./components/purchase_exam";