build

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

@@ -1,33 +1,33 @@
 // 企业客户/供应商账号相关
-import http from "@/apis/axios";
-const api = "admin/";
+import http from '@/apis/axios'
+const api = 'admin/'
 export default {
   // 列表1
-  list: (data, params) => http(api + "crontablist", data, "post", params),
+  list: (data, params) => http(api + 'crontablist', data, 'post', params),
   // 任务详情
-  detail: (data, params) => http(api + "consultzxinfo", data, "post", params),
+  detail: (data, params) => http(api + 'consultzxinfo', data, 'post', params),
   // 采返商品详情
   good_detail: (data, params) =>
-    http(api + "consultfeadinfo", data, "post", params),
+    http(api + 'consultfeadinfo', data, 'post', params),
   // 反馈商品添加
-  good_add: (data, params) => http(api + "consultfeed", data, "post", params),
+  good_add: (data, params) => http(api + 'consultfeed', data, 'post', params),
   // 反馈商品编辑
   good_update: (data, params) =>
-    http(api + "consultfeededit", data, "post", params),
+    http(api + 'consultfeededit', data, 'post', params),
   // 反馈商品列表
   good_list: (data, params) =>
-    http(api + "consultbidlist", data, "post", params),
+    http(api + 'consultbidlist', data, 'post', params),
   // 更新
-  update: (data, params) => http(api + "customaredit", data, "post", params),
+  update: (data, params) => http(api + 'customaredit', data, 'post', params),
   // 新建
-  add: (data, params) => http(api + "customarcreate", data, "post", params),
+  add: (data, params) => http(api + 'customarcreate', data, 'post', params),
   // 删除
-  delete: (data, params) => http(api + "customardelete", data, "post", params),
+  delete: (data, params) => http(api + 'customardelete', data, 'post', params),
   // 状态
-  status: (data, params) => http(api + "resultstatu", data, "post", params),
+  status: (data, params) => http(api + 'resultstatu', data, 'post', params),
   // 获取实时金价
   golpricelast: (data, params) =>
-    http(api + "golpricelast", data, "post", params),
+    http(api + 'golpricelast', data, 'post', params),
   // 获取分类详情
-  catinfo: (data, params) => http(api + "catinfo", data, "post", params),
-};
+  catinfo: (data, params) => http(api + 'catinfo', data, 'post', params)
+}

src/views/goodStore/supplierGoodsCost/components/addEdit.vue

@@ -39,15 +39,15 @@
               <template slot-scope="scope">
                 <div
                   v-if="scope.row.good_thumb_img"
+                  v-viewer
                   style="width: 20px; height: 20px"
                   class="hover"
-                  v-viewer
                 >
                   <img
                     :src="scope.row.good_thumb_img"
                     style="display: inline-block; width: 100%; height: 100%"
                     alt=""
-                  />
+                  >
                 </div>
               </template>
             </el-table-column>
@@ -76,9 +76,9 @@
                   :type="scope.row.good_type == '1' ? '' : 'warning'"
                   v-text="
                     (options1.find((item) => item.id == scope.row.status) || {}).name ||
-                    '--'
+                      '--'
                   "
-                ></el-tag>
+                />
               </template>
             </el-table-column>
             <el-table-column
@@ -122,7 +122,7 @@
                   <search-terrace
                     :value="ruleForm.platform"
                     :disabled="false"
-                    :isDetail="false"
+                    :is-detail="false"
                     :is_show="'1'"
                     :placeholder="'所属平台'"
                     @searchChange="platform_codesearchChange"
@@ -130,9 +130,9 @@
                 </el-form-item>
                 <el-form-item label="上线原因" prop="online_reason">
                   <el-input
+                    v-model="ruleForm.online_reason"
                     :disabled="false"
                     placeholder="上线原因"
-                    v-model="ruleForm.online_reason"
                     maxlength="200"
                   />
                 </el-form-item>
@@ -140,13 +140,13 @@
               <el-col :span="16" style="text-align: right">
                 <el-form-item label="上线备注" prop="online_remark">
                   <el-input
+                    v-model="ruleForm.online_remark"
                     type="textarea"
                     :rows="3"
                     :disabled="false"
                     placeholder="商品备注"
                     maxlength="2000"
                     show-word-limit
-                    v-model="ruleForm.online_remark"
                   />
                 </el-form-item>
                 <el-button
@@ -154,7 +154,7 @@
                   type="primary"
                   :size="'mini'"
                   @click="submitForm"
-                  >保 存
+                >保 存
                 </el-button>
                 <el-button :size="'mini'" @click="showModelThis = false">{{
                   id == "007" ? "关 闭" : "取 消"
@@ -168,173 +168,173 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/goodStore/goodsCost";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/goodStore/goodsCost'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "brand",
-  props: ["showModel", "id", "sitem"],
+  name: 'Brand',
   mixins: [resToken],
+  props: ['showModel', 'id', 'sitem'],
   data() {
     return {
       loading: false,
       showModelThis: this.showModel,
       ruleForm: {
-        platform: "", //string	平台id
-        online_reason: "", //string	上线原因
-        online_remark: "", //string	上线备注
+        platform: '', // string	平台id
+        online_reason: '', // string	上线原因
+        online_remark: '' // string	上线备注
       },
-      //是否定制
+      // 是否定制
       options1: [
-        { id: "0", name: "否" },
-        { id: "1", name: "是" },
+        { id: '0', name: '否' },
+        { id: '1', name: '是' }
       ],
       rulesThis: this.rules,
       rules: {
         platform: [
           {
             required: true,
-            message: "请选择所属平台",
-            trigger: "change",
-          },
+            message: '请选择所属平台',
+            trigger: 'change'
+          }
         ],
         online_reason: [
           {
             required: true,
-            message: "上线原因不能为空",
-            trigger: "blur",
-          },
+            message: '上线原因不能为空',
+            trigger: 'blur'
+          }
         ],
         online_remark: [
           {
             required: true,
-            message: "上线备注不能为空",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            message: '上线备注不能为空',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
+      this.loading = true
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.loading = false
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
           this.ruleForm = {
-            platform: "", //string	平台id
-            online_reason: "", //string	上线原因
-            online_remark: "", //string	上线备注
-          };
+            platform: '', // string	平台id
+            online_reason: '', // string	上线原因
+            online_remark: '' // string	上线备注
+          }
         }
-      });
+      })
     },
     platform_codesearchChange(e) {
-      const { id, code, label } = e;
-      this.ruleForm.platform = id || "";
-      this.$refs.ruleForm.validateField("platform");
+      const { id, code, label } = e
+      this.ruleForm.platform = id || ''
+      this.$refs.ruleForm.validateField('platform')
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (!this.loading) {
-            this.loading = true;
-            let model = JSON.parse(JSON.stringify(this.ruleForm));
+            this.loading = true
+            const model = JSON.parse(JSON.stringify(this.ruleForm))
             // model.platform = model.platform.toString();
-            model.codes = [];
-            let list = JSON.parse(JSON.stringify(this.sitem));
+            model.codes = []
+            const list = JSON.parse(JSON.stringify(this.sitem))
             list.forEach((e) => {
-              model.codes.push(e.spuCode);
-            });
-            let { code, data, message } = await asyncRequest.online_add(model);
-            this.loading = false;
+              model.codes.push(e.spuCode)
+            })
+            const { code, data, message } = await asyncRequest.online_add(model)
+            this.loading = false
             if (code === 0) {
               this.$notify.success({
-                title: "已成功添加至上线流程！",
-                message: "",
-              });
-              this.showModelThis = false;
+                title: '已成功添加至上线流程！',
+                message: ''
+              })
+              this.showModelThis = false
               // 刷新
-              this.$emit("refresh");
+              this.$emit('refresh')
             } else if (code >= 100 && code <= 104) {
-              await this.logout();
+              await this.logout()
             } else if (code === 1009) {
-              let resList = JSON.parse(JSON.stringify(data));
+              const resList = JSON.parse(JSON.stringify(data))
 
-              let htmlList = "<ul>";
+              let htmlList = '<ul>'
               resList.forEach((v) => {
                 htmlList += `<li>
           <img src='${v.good_img}' style='width: 20px; height: 20px'
                   class='hover'
                   v-viewer/>
-                  <span>${v.good_name}__</span>`;
-                const { speclist } = v;
-                let str = "<span>";
+                  <span>${v.good_name}__</span>`
+                const { speclist } = v
+                let str = '<span>'
                 speclist.forEach((a, ai) => {
-                  str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
-                });
-                htmlList += str + "</span>" + `</li>`;
-              });
-              htmlList += "</ul>";
+                  str += `${ai !== 0 ? '--' : ''}${a.spec_name}[${a.spec_value}]`
+                })
+                htmlList += str + '</span>' + `</li>`
+              })
+              htmlList += '</ul>'
               this.$notify({
-                title: "以下商品已上线或已经在审批流程中！",
+                title: '以下商品已上线或已经在审批流程中！',
                 dangerouslyUseHTMLString: true,
-                message: htmlList,
-              });
+                message: htmlList
+              })
             } else if (code === 1010) {
-              let resList = JSON.parse(JSON.stringify(data));
+              const resList = JSON.parse(JSON.stringify(data))
 
-              let htmlList = "<ul>";
+              let htmlList = '<ul>'
               resList.forEach((v) => {
                 htmlList += `<li>
           <img src='${v.good_img}' style='width: 20px; height: 20px'
                   class='hover'
                   v-viewer/>
-                  <span>${v.good_name}__</span>`;
-                const { speclist } = v;
-                let str = "<span>";
+                  <span>${v.good_name}__</span>`
+                const { speclist } = v
+                let str = '<span>'
                 speclist.forEach((a, ai) => {
-                  str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value}]`;
-                });
-                htmlList += str + "</span>" + `</li>`;
-              });
-              htmlList += "</ul>";
+                  str += `${ai !== 0 ? '--' : ''}${a.spec_name}[${a.spec_value}]`
+                })
+                htmlList += str + '</span>' + `</li>`
+              })
+              htmlList += '</ul>'
               this.$notify({
-                title: "该平台要求商品必须要有一件的成本！",
+                title: '该平台要求商品必须要有一件的成本！',
                 dangerouslyUseHTMLString: true,
-                message: htmlList,
-              });
+                message: htmlList
+              })
             } else {
-              this.$message.warning(res.message);
+              this.$message.warning(res.message)
             }
           }
         } else {
           // console.log("error submit!!");
-          return false;
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/goodStore/supplierGoodsCost/components/baseForm.vue

@@ -21,20 +21,20 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="业务公司" prop="company_id">
-<!--              <search-work-company-->
-<!--                :value="ruleForm.company_id"-->
-<!--                :placeholder="'业务公司'"-->
-<!--                :disabled="type === 'view' || type === 'editBase' || type === 'editCoin'"-->
-<!--                :size="'mini'"-->
-<!--                :isDetail="type !== 'add'"-->
-<!--                @searchChange="company_idsearchChange"-->
-<!--              />-->
-              <el-input :value="getCompanyWithCode(ruleForm.companyNo).name" disabled />
+             <search-work-company
+               :value="ruleForm.company_id"
+               :placeholder="'业务公司'"
+               :disabled="type === 'view' || type === 'editBase' || type === 'editCoin'"
+               :size="'mini'"
+               :isDetail="type !== 'add'"
+               @searchChange="company_idsearchChange"
+            />
+              <!-- <el-input :value="getCompanyWithCode(ruleForm.companyNo).name" disabled /> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="供应商" prop="supplierNo">
-              <search-supplier
+              <!-- <search-supplier
                 :value="ruleForm.supplierNo"
                 :placeholder="'供应商'"
                 :disabled="type === 'view' || type === 'editCoin'"
@@ -43,7 +43,9 @@
                 :isDetail="type !== 'add'"
                 :isp="this.type !== 'view'"
                 @searchChange="supplierNosearchChange"
-              />
+              /> -->
+
+                <el-input :value="getCompanyWithCode(ruleForm.companyNo).name" disabled />
             </el-form-item>
           </el-col>
 
@@ -1203,6 +1205,8 @@ export default {
       this.sch_is_noble();
       this.good_type_change();
 
+      console.log(this.ruleForm)
+
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (!this.loading) {
@@ -1897,7 +1901,7 @@ export default {
           };
         }
 
-        this.ruleForm.company_id = this.currentCompany
+        this.ruleForm.supplierNo = this.currentCompany
         await this.set_must_spec();
       });
     },

src/views/goodStore/supplierGoodsCost/index.vue

@@ -551,8 +551,8 @@ export default {
   },
   methods: {
     handleCreate(){
-      if(!this.currentIsBusinessCompany()) return
-      this.routeGoto('goodsCostDetail', { id: 'add', type: 'add' })
+      // if(!this.currentIsBusinessCompany()) return
+      this.routeGoto('supplierGoodsCostDetail', { id: 'add', type: 'add' })
     },
     // 获取异常原因下拉列表
     async getresultlist() {
@@ -787,9 +787,10 @@ export default {
       item.spucode = this.select === "1" ? this.sinput : "";
       item.good_name = this.select === "2" ? this.sinput : "";
       item.companyNo = this.select === "3" ? this.sinput : "";
-      item.supplierNo = this.select === "4" ? this.sinput : "";
       item.company_name = this.select === "5" ? this.sinput : ""; // 部门
       item.cat_id = item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
+      item.supplierNo = this.currentCompany
+
       const res = await asyncRequest.list(item);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/goodStore/supplierGoodsOffline/detail.vue

@@ -35,12 +35,13 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper";
 import asyncRequest from "@/apis/service/goodStore/goodsOffline";
 import { costArr } from "./columns";
 import { mapGetters } from "vuex";
 export default {
   name: "goodsOfflineDetail",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {},
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -72,8 +73,8 @@ export default {
   },
   methods: {
     async searchList() {
+      // console.log(111)
       this.loading = true;
-
       const res = await asyncRequest.goodoffdetail(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.list = res.data;

src/views/goodStore/supplierGoodsOffline/index.vue

@@ -127,6 +127,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper"
 import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/goodStore/goodsOffline";
 import periodDatePickerActive from "./period-date-picker/main.vue";
@@ -135,7 +136,7 @@ import { mapGetters } from "vuex";
 
 export default {
   name: "goodsOffline",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     periodDatePickerActive
   },
@@ -247,8 +248,8 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
+      this.parmValue.supplierNo = this.currentCompany
       this.loading = true;
-      console.log(this.parmValue)
       const res = await asyncRequest.goodofflist(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
@@ -290,6 +291,8 @@ export default {
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
       this.parmValue.end_date = e.endTime || "";
+      this.parmValue.supplierNo = this.currentCompany;
+      
       if (
         (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
         (this.parmValue.start_date === "" && this.parmValue.end_date !== "")

src/views/sellOut/sellAfterApply/detail.vue

@@ -93,11 +93,19 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="供应商审核" name="4">
+            <el-collapse-item name="4" label="待采购审核" v-if="status + '' === '2'">
+              <purchase-exam />
+            </el-collapse-item>
+
+            <el-collapse-item name="5" title="供应商审核"  v-if="status=== '9'">
               <supplier-exam @changeStatus="handleSupplierExam" />
             </el-collapse-item>
+
+            <el-collapse-item name="6" title="待客户退货" v-if="status === '4'">
+              <wait-return @changeStatus="handleExpress" />
+            </el-collapse-item>
             
-            <el-collapse-item
+            <!-- <el-collapse-item
               title="采购审核"
               name="4"
               v-if="
@@ -115,7 +123,7 @@
                 v-if="newTime != ''"
                 @refresh="initData"
               />
-            </el-collapse-item>
+            </el-collapse-item> -->
 
             <!-- <el-collapse-item>
               <supplier-exam />
@@ -167,11 +175,13 @@ import { sellshowColumns } from "./columns";
 import purchaseExam from "./components/purchase_exam";
 import SupplierExam from "./components/supplier_exam.vue";
 import { xs_order_type_options } from "@/assets/js/statusList";
+import WaitReturn from "./components/wait-return.vue";
 
 export default {
   name: "sellAfterApplyDetail",
   mixins: [mixinPage, resToken],
   components: {
+    WaitReturn,
     SupplierExam,
     purchaseExam,
     ExpressFeedback
@@ -256,14 +266,31 @@ export default {
     this.initData();
   },
   methods: {
+    async handleExpress(data){
+      let res = await asyncRequest.express({
+        ...data,
+        returnCode: this.code
+      });
+      
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: "修改成功！",
+          message: "",
+        });
+        await this.initData();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+    
     async handleSupplierExam(data){
-      const model = {
-        remark,
-        returnCode: this.code,
-        status: type,
-      };
-      let res = await asyncRequest.status(model);
-
+      let res = await asyncRequest.status({
+        ...data,
+        returnCode: this.code
+      });
+      
       if (res && res.code === 0) {
         this.$notify.success({
           title: "修改成功！",

src/views/sellOut/sellOutOrder/detail.vue

@@ -386,6 +386,7 @@ export default {
         this.$store.getters.btnList.find(
           (item) => item.menu_route == "sellOutOrderDetail"
         ) || {};
+
       const { action } = tran ?? {};
       return action ?? [];
     },

src/views/sellOut/sellReturn/columns.js

@@ -18,7 +18,7 @@ export default [
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    width: '160px'
+    width: '180px'
   },
   {
     prop: 'good_code',

src/views/sellOut/sellReturn/components/approval-results.vue

@@ -1,9 +1,9 @@
 <template>
-  <el-form ref="formRef" class="supplier-form" size="mini" label-width="130px" :model="formData" :rules="rules">
+  <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
     <el-form-item label="审核状态" prop="status">
       <el-select v-model="formData.status" style="width:100%">
-        <el-option label="修改供应商审批结果,需供应商确认" value="10" />
-        <el-option label="认同供应商审批结果,并设置业务公司退回仓库" value="4" />
+        <el-option label="修改供应商审批结果" value="10" />
+        <el-option label="认同供应商审批结果" value="4" />
       </el-select>
     </el-form-item>
 

src/views/sellOut/sellReturn/detail.vue

@@ -145,19 +145,17 @@
                 :iscgd="false"
               />
             </el-collapse-item>
-            <el-collapse-item
-              title="业务审核"
-              name="3"
-              v-if="
-                newTime !== '' &&
+            <!-- newTime !== '' &&
                 sitem &&
                 !(
                   (sitem.order_type + '' === '1' || sitem.order_type + '' === '2') &&
                   is_stock + '' === '1'
                 ) &&
-                ppowers.some((i) => i == '1') &&
-                status + '' === '1'
-              "
+                ppowers.some((i) => i == '1') && -->
+            <el-collapse-item
+              title="业务审核"
+              name="3"
+              v-if="status + '' === '1'"
             >
               <exam-form
                 v-if="newTime"
@@ -169,18 +167,18 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item
-              title="供应商审核"
-              name="4"
-              v-if="
-                newTime !== '' &&
+            <!-- newTime !== '' &&
                 sitem &&
                 !(
                   (sitem.order_type + '' === '1' || sitem.order_type + '' === '2') &&
                   is_stock + '' === '1'
                 ) &&
-                ppowers.some((i) => i == '1') &&
-                status + '' === '9'
+                ppowers.some((i) => i == '1') && -->
+
+            <el-collapse-item
+              title="供应商审核"
+              name="4"
+              v-if="status + '' === '9'
               "
             >
               <exam-form
@@ -195,7 +193,18 @@
 
 
             <el-collapse-item title="供应商已驳回,待采购审核" name="5" v-if="status + '' === '8'">
-              <approval-results />
+              <approval-results @changeStatus="handlePurchaseExam" />
+            </el-collapse-item>
+
+            <el-collapse-item title="业务公司修改待供应商确认" name="6" v-if="status + '' === '10'">
+              <exam-form
+                v-if="newTime"
+                :statusList="statusList"
+                :newTime="newTime"
+                :disabled="false"
+                :isMust="false"
+                @searchChange="handleSupplierConfirm"
+              />
             </el-collapse-item>
 
             <!-- <el-collapse-item
@@ -326,7 +335,7 @@ export default {
       ],
       xs_order_type_options,
       sitem: null, //传给组件
-      activeNames: ["0", "1", "2", "3", "4", "5"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "6"],
       sitem: null,
       status: "", //存储详情接口状态
       statusList: [
@@ -367,9 +376,38 @@ export default {
           console.log("取消");
         });
     },
+    async handlePurchaseExam(data){
+      let _model = {
+        returnCode: this.queryId,
+        ...data
+      };
+
+      let res = await asyncRequest.status(_model);
+      console.log(res)
+
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: "更新成功！",
+          message: "",
+        });
+        await this.initData();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
+    //供应商确认
+    async handleSupplierConfirm(e){
+      if (!this.loading) {
+        let type = e.state + '' === "1" ? "4" : "8";
+        let message = e.state + '' === "1" ? "提交审核结果" : "提交审核结果";
+        await this.statusConfirm(type, message, e.remark);
+      }
+    },
     // 点击业务审核的保存按钮
     async examForm(e) {
       if (!this.loading) {

src/views/sellOut/sellReturn/index.vue

@@ -243,7 +243,6 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue);
       const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;

src/views/supplierPurchaseIn/purchaseDiffOrder/index.vue

@@ -159,13 +159,14 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseDiffOrder";
+import companyHelper from "@/mixins/companyHelper"
 // import addEditModel from "./addEditModel";
 import columns from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
   name: "purchaseDiffOrder",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken,companyHelper],
   components: {
     // addEditModel,
   },
@@ -365,6 +366,8 @@ export default {
         return;
       }
       this.loading = true;
+
+      this.parmValue.supplierNo = this.currentCompany
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierPurchaseIn/purchaseOrder/index.vue

@@ -217,6 +217,7 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper"
 import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import { columns, statusOptions } from "./columns";
@@ -225,7 +226,7 @@ import { mapGetters } from "vuex";
 
 export default {
   name: "purchaseOrder",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {},
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
@@ -635,7 +636,8 @@ export default {
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 采购供应商编号
       this.parmValue.company_name = this.select === "9" ? this.input : ""; // 部门
       this.parmValue.supplier_name = this.select === "10" ? this.input : ""; // 采购供应商名称
-      console.log(this.pageInfo);
+
+      this.parmValue.supplierNo = this.currentCompany
       // this.wsm_supplierNo = [];
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/supplierPurchaseIn/purchaseReturn/index.vue

@@ -189,13 +189,14 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper"
 import columns from "./columns";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseReturn";
 import { mapGetters } from "vuex";
 import { cg_order_type_options } from "@/assets/js/statusList";
 export default {
   name: "purchaseReturn",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -369,6 +370,8 @@ export default {
     async searchList() {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.supplierNo = this.currentCompany;
+      
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierPurchaseIn/recovery/index.vue

@@ -187,13 +187,14 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper"
 import asyncRequest from "@/apis/service/purchaseIn/recovery";
 import { columns } from "./columns";
 import { mapGetters } from "vuex";
 import showData from "./showData";
 export default {
   name: "supplierRecovery",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     showData,
   },
@@ -270,6 +271,7 @@ export default {
 
     async searchList() {
       this.loading = true;
+      this.parmValue.supplierNo = this.currentCompany
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierPurchaseIn/workbench/index.vue

@@ -95,11 +95,12 @@
 import asyncRequest from "@/apis/service/purchaseIn/workbench";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
+import companyHelper from "@/mixins/companyHelper";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 export default {
   name: "workbench",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -287,7 +288,10 @@ export default {
     async searchList(type) {
       if (!this.loading) {
         this.loading = true;
-        const { code, data } = await asyncRequest.list(this.parmValue);
+        const { code, data } = await asyncRequest.list({
+          ...this.parmValue,
+          supplierNo:this.currentCompany
+        });
         if (code === 0) {
           const { list, count } = data;
           this.list = list;

src/views/supplierPurchaseIn/wsmInOrder/index.vue

@@ -217,6 +217,7 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper"
 
 import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
 import { cg_order_type_options } from "@/assets/js/statusList";
@@ -225,7 +226,7 @@ import { mapGetters } from "vuex";
 
 export default {
   name: "purchaseOrder",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {},
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -367,6 +368,8 @@ export default {
         this.parmValue.sselect = this.sselect;
         this.parmValue.input = this.input;
 
+        this.parmValue.supplierNo = this.currentCompany
+
         //
         let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
@@ -480,6 +483,7 @@ export default {
       this.parmValue.company_name = this.select === "8" ? this.input : ""; // 部门
       // this.wsm_supplierNo = [];
       let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.supplierNo = this.currentCompany
 
       let _model = {
         cgdNo: model.cgdNo,

src/views/supplierSellOut/filing/index.vue

@@ -168,7 +168,7 @@ import { mapGetters } from "vuex";
 
 export default {
   name: "filing",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -357,6 +357,7 @@ export default {
       this.parmValue.companyName = this.select === "4" ? this.s_input : "";
       this.parmValue.companyCode = this.select === "5" ? this.s_input : "";
       this.parmValue.orderCode = this.select === "6" ? this.s_input : "";
+
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierSellOut/returnOrder/index.vue

@@ -181,13 +181,14 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import columns from "./columns";
+import companyHelper from "@/mixins/companyHelper"
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 
 export default {
   name: "returnOrder",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     addEdit,
   },
@@ -376,6 +377,8 @@ export default {
       this.parmValue.order_code = this.select === "orderNo" ? this.s_input : "";
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.post_compay = model.post_compay.toString();
+      model.supplierNo = this.currentCompany
+      
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierSellOut/salesOrder/index.vue

@@ -59,7 +59,7 @@
                 </el-select>
               </el-col>
               <!-- 客户公司 -->
-              <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
+              <!-- <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
                 <search-work-company
                   :type="'1'"
                   :value="parmValue.supplierNo"
@@ -69,7 +69,7 @@
                   :isDetail="false"
                   @searchChange="supplierChange"
                 />
-              </el-col>
+              </el-col> -->
 
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
@@ -276,6 +276,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper";
 import asyncRequest from "@/apis/service/sellOut/salesOrder";
 import columns from "./columns"; //表格列参数
 import addEdit from "./components/addEdit";
@@ -287,7 +288,7 @@ import {
 } from "@/assets/js/statusList";
 export default {
   name: "salesOrder",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     addEdit,
     userAddEdit,
@@ -513,6 +514,10 @@ export default {
       this.parmValue.company_name =
         this.select === "company_name" ? this.input : "";
 
+      console.log(this.currentCompany)
+
+      this.parmValue.supplierNo = this.currentCompany
+
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierSellOut/sellAfterApply/columns.js

@@ -1,22 +1,22 @@
 const columns = [
   {
-    prop: "orderCode",
-    label: "订单编号",
-    width: "160"
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '160'
   },
   {
-    prop: "returnCode",
-    label: "售后申请单",
-    width: "160"
+    prop: 'returnCode',
+    label: '售后申请单',
+    width: '160'
   },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人'
   },
   // {
   //   prop: "orderCode",
@@ -24,23 +24,23 @@ const columns = [
   //   width:"160"
   // },
   {
-    prop: "outCode",
-    label: "发货申请单编号",
-    width: "160"
+    prop: 'outCode',
+    label: '发货申请单编号',
+    width: '160'
   },
   {
-    prop: "total_num",
-    label: "出库总数",
+    prop: 'total_num',
+    label: '出库总数'
   },
   {
-    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:"error_num",
@@ -59,18 +59,17 @@ const columns = [
   // },
 
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "addtime",
-    label: "添加时间",
-    width: 150,
+    prop: 'addtime',
+    label: '添加时间',
+    width: 150
   },
 
-
   // {
   //   prop:"post_company",
   //   label:"快递名称",
@@ -92,95 +91,94 @@ const columns = [
   //   width:"150"
   // },
   {
-    prop: "customer_name",
-    label: "客户名称",
-    width: "200"
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '200'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: 50,
-  },
+    _slot_: 'operation',
+    width: 50
+  }
 ]
 const sellshowColumns = [
   {
-    prop: "returnCode",
-    label: "售后申请单号",
+    prop: 'returnCode',
+    label: '售后申请单号',
     span: 6
   },
   {
-    prop: "status",
-    label: "售后申请单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '售后申请单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "outCode",
-    label: "发货申请单编号",
+    prop: 'outCode',
+    label: '发货申请单编号',
     span: 6
   },
 
   {
-    prop: "order_type",
-    label: "订单类别",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '订单类别',
+    _slot_: 'order_type',
     span: 6
   },
 
   {
-    prop: "is_receive",
-    label: "收货情况",
-    _slot_: "is_receive",
+    prop: 'is_receive',
+    label: '收货情况',
+    _slot_: 'is_receive',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "total_num",
-    label: "发货总数量",
+    prop: 'total_num',
+    label: '发货总数量',
     span: 4
   },
   {
-    prop: "error_num",
-    label: "异常数量",
+    prop: 'error_num',
+    label: '异常数量',
     span: 4
   },
 
-
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 4
   },
 
   {
-    prop: "error_msg",
-    label: "异常原因",
+    prop: 'error_msg',
+    label: '异常原因',
     span: 6
   },
   {
-    prop: "except_code",
-    label: "期望",
-    _slot_: "except_code",
+    prop: 'except_code',
+    label: '期望',
+    _slot_: 'except_code',
     span: 6
   },
   {
-    prop: "error_img",
-    label: "异常图片",
-    _slot_: "error_img",
+    prop: 'error_img',
+    label: '异常图片',
+    _slot_: 'error_img',
     span: 12
   },
   {
-    prop: "error_remark",
-    label: "备注",
+    prop: 'error_remark',
+    label: '备注',
     span: 24
-  },
+  }
   // {
   //   prop: "sale_price",
   //   label: "销售单价",
@@ -204,7 +202,5 @@ const sellshowColumns = [
   //   label: "更新时间",
   // },
 
-
-
 ]
-export { columns, sellshowColumns }
+export { columns, sellshowColumns }

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

@@ -1,289 +1,142 @@
 <template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :size="'mini'"
-    :rules="rules"
-    label-width="100px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="6"
-        ><el-form-item label="审核状态" prop="status">
-          <el-select
-            v-model="ruleForm.status"
-            placeholder="请选择审核状态"
-            style="width: 100%"
-            :size="'mini'"
-            :disabled="!(status + '' == '2' && ppowers.some((i) => i == '2'))"
-            @change="statusChange"
-          >
-            <el-option
-              v-for="item in statusList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6" v-show="ruleForm.status + '' === '1' && is_receive + '' === '1'">
-        <el-form-item label="物流费承担方" prop="is_th" label-width="110px">
-          <el-select
-            v-model="ruleForm.is_th"
-            style="width: 100%"
-            :disabled="!(status == '2' && ppowers.some((i) => i == '2'))"
-            placeholder="是否承担物流费"
-            :size="'mini'"
-          >
-            <el-option
-              v-for="item in is_th_list"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6" v-show="ruleForm.status + '' === '1' && is_receive + '' === '1'">
-        <el-form-item label="退回至" prop="return_tag">
-          <el-select
-            v-model="ruleForm.return_tag"
-            style="width: 100%"
-            :disabled="!(status == '2' && ppowers.some((i) => i == '2'))"
-            placeholder="是否承担物流费"
-            :size="'mini'"
-          >
-            <el-option
-              v-for="item in return_tag_options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12" v-show="ruleForm.status + '' === '0'">
-        <el-form-item
-          label="审核备注"
-          :disabled="!(status == '2' && ppowers.some((i) => i == '2'))"
-          prop="remark"
-        >
-          <el-input
-            type="textarea"
-            :size="'mini'"
-            placeholder="请输入审核备注"
-            v-model="ruleForm.remark"
-            :disabled="disabled"
-            maxlength="250"
-            :autosize="{ minRows: 2, maxRows: 2 }"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6" v-if="status == '2' && ppowers.some((i) => i == '2')" class="tr">
-        <el-button v-if="!isDetail" :size="'mini'" type="primary" @click="submitForm"
-          >保 存
-        </el-button>
-      </el-col>
-    </el-row>
+  <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
+    <el-form-item label="审核状态" prop="status">
+      <el-select v-model="formData.status" style="width:100%">
+        <el-option label="修改供应商审批结果" value="10" />
+        <el-option label="认同供应商审批结果" value="4" />
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="审核备注" prop="remark">
+      <el-input v-model="formData.remark" />
+    </el-form-item>
+
+    <template v-if="displayExpressField">
+      <el-form-item label="退回至" prop="wsm_code">
+        <search-stock
+          :size="'mini'"
+          :value="formData.wsm_code"
+          placeholder="退货仓库"
+          :is-detail="true"
+          :is-relation="true"
+          :names="wsm_code_name"
+          :company-no="currentCompany"
+          @searchChange="stockChange"
+        />
+      </el-form-item>
+
+      <el-form-item label="">
+        <el-input v-model="expressInfo" placeholder="退货仓库收货信息展示" disabled />
+      </el-form-item>
+    </template>
+
+    <el-form-item>
+      <div style="width:100%;display:flex;justify-content:flex-end">
+        <el-button type="primary" @click="submit">提交</el-button>
+      </div>
+    </el-form-item>
   </el-form>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
-import resToken from "@/mixins/resToken";
+import companyHelper from '@/mixins/companyHelper'
 export default {
-  name: "sellAfterApplyDetail",
-  mixins: [resToken],
-  props: ["id", "newTime", "sitem", "show"],
+  name: 'ApprovalResults',
+  mixins: [companyHelper],
+  props: ['sitem'],
   data() {
     return {
-      loading: false,
-      is_receive: "1",
-      status: "",
-      statusList: [
-        {
-          value: "1",
-          label: "通过",
-        },
-        {
-          value: "0",
-          label: "驳回",
-        },
-      ],
-      is_th_list: [
-        {
-          value: "1",
-          label: "收货人承担",
-        },
-        {
-          value: "2",
-          label: "业务公司承担",
-        },
-        {
-          value: "3",
-          label: "供应商承担",
-        },
-      ],
-      return_tag_options: [
-        {
-          value: "1",
-          label: "供应商仓库",
-        },
-        {
-          value: "2",
-          label: "业务公司仓库",
-        },
-      ],
-
-      showModelThis: this.showModel,
-      ruleForm: {
-        status: "1", // 通过or驳回
-        is_th: "1", //驳回至
-        return_tag: "1",
-        remark: "",
+      company: '',
+      formData: {
+        status: '10',
+        remark: '',
+        wsm_code: ''
       },
-      rulesThis: this.rules,
-      rules: {
-        status: [
-          {
-            required: true,
-            message: "请选择审核状态",
-            trigger: "change",
-          },
-        ],
-        is_th: [
+      wsm_code: '',
+      wsm_name: '',
+      expressInfo: ''
+    }
+  },
+  computed: {
+    displayExpressField() {
+      return this.formData.status === '4'
+    },
+    rules() {
+      const { status } = this.formData
+      return ({
+        wsm_code: [
           {
+            type: 'array',
             required: true,
-            message: "请选择物流费承担方",
-            trigger: "change",
-          },
+            trigger: 'change',
+            message: '请选择退货仓库'
+          }
         ],
-        return_tag: [
+        status: [
           {
             required: true,
-            message: "请选择退回位置",
-            trigger: "change",
-          },
+            trigger: 'change',
+            message: '请选择退货仓库'
+          }
         ],
         remark: [
-          { required: true, message: "请输入审核备注", trigger: "blur" },
           {
-            min: 1,
-            max: 250,
-            message: "长度在 1 到 250 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
-  },
-  computed: {
-    powers() {
-      const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "sellAfterApplyDetail"
-        ) || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
-    ppowers() {
-      const tran =
-        this.$store.getters.roleProcess.find((i) => i.process_type === "SHD") || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
+            required: status === '10',
+            trigger: 'change',
+            message: '请输入审核备注'
+          }
+        ]
+      })
+    }
   },
   watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
+    'formData.status'(status) {
+      this.expressInfo = ''
+      this.formData = {
+        status,
+        remark: '',
+        wsm_code: ''
       }
-    },
+    }
   },
   mounted() {
-    this.initForm();
   },
   methods: {
-    async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.statusChange();
-      this.loading = false;
+    async stockChange(e) {
+      const { code, label, contactor, mobile, addr_cn } = e
+      this.expressInfo = `${contactor}-${mobile}-${addr_cn}`
+      this.wsm_name = label || ''
+      this.wsm_code = code || ''
+      this.formData.wsm_code = code ? [code] : []
+      this.$refs.formRef.validateField('wsm_code')
     },
+    submit() {
+      this.$refs.formRef.validate(isValid => {
+        if (!isValid) return
 
-    statusChange() {
-      this.rulesThis.is_th[0].required =
-        this.ruleForm.status + '' === "1" && this.is_receive + '' === "1";
-      this.rulesThis.remark[0].required = this.ruleForm.status + '' !== "1";
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const {
-            returnCode,
-            is_receive,
-            status,
-            return_tag,
-            is_th,
-            remark,
-          } = this.sitem;
-          this.status = status || "";
-          this.is_receive = is_receive || "1";
-          this.ruleForm = {
-            status: "1", // 通过or驳回
-            is_th: is_th || "1", //驳回至
-            return_tag: return_tag || "1",
-            remark: remark || "",
-            returnCode: returnCode || "",
-          };
+        const { wsm_code, status } = this.formData
+
+        let _status = status
+
+        if (status === '4' && String(this.sitem.is_receive) === '0') {
+          _status = '5'
         }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          if (this.loading) {
-            return;
-          }
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.status = model.status + '' === "1" ? "3" : "6";
-          model.is_th = this.is_receive + '' === "0" ? "0" : model.is_th;
-          model.return_tag = this.is_receive + '' === "0" ? "0" : model.return_tag;
-          model.is_post = "0";
-          console.log(model);
-          let res = await asyncRequest.status(model);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "提交成功！",
-              message: "",
-            });
-            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;
+
+        const params = {
+          ...this.formData,
+          status: _status,
+          wsm_code: Array.isArray(wsm_code) ? wsm_code[0] : wsm_code
         }
-      });
-    },
-  },
-};
+        this.$emit('changeStatus', params)
+      })
+    }
+  }
+}
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.supplier-form{
+  ::v-deep(.el-form-item){
+    width: 500px;
+  }
+}
+</style>

src/views/supplierSellOut/sellAfterApply/components/supplier-confirm.vue

@@ -0,0 +1,168 @@
+<template>
+  <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
+    <el-form-item label="审核状态" prop="status">
+      <el-select v-model="formData.status" style="width:100%">
+        <el-option v-for="opt in statusOptions" :key="opt.value" :value="opt.value" :label="opt.label" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="审核备注" prop="remark">
+      <el-input v-model="formData.remark" />
+    </el-form-item>
+
+    <template v-if="displayExpressField">
+      <el-form-item label="收货人" prop="contactor">
+        <el-input v-model="formData.contactor" />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile">
+        <el-input v-model="formData.mobile" max-length="11" />
+      </el-form-item>
+      <el-form-item label="退货地址" prop="addr_code">
+        <select-area
+          :placeholder="'省/市/区'"
+          :value="formData.addr_code"
+          :is-detail="true"
+          :size="'mini'"
+          @selectChange="addr_selectChange"
+        />
+      </el-form-item>
+
+      <el-form-item prop="addr" label="详细地址">
+        <el-input v-model="formData.addr" placeholder="详细地址" />
+      </el-form-item>
+    </template>
+
+    <el-form-item>
+      <div style="width:100%;display:flex;justify-content:flex-end">
+        <el-button type="primary" @click="submit">提交</el-button>
+      </div>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { isMobile } from '@/utils/validate'
+
+const validatename = (rule, value, callback) => {
+  if (value === '') {
+    callback(new Error('收件人不能为空！'))
+  } else {
+    callback()
+  }
+}
+const validatemobile = (rule, value, callback) => {
+  if (value === '') {
+    callback(new Error('手机号不能为空！'))
+  } else {
+    if (!isMobile(value)) {
+      callback(new Error('手机号格式不正确！'))
+    } else {
+      callback()
+    }
+  }
+}
+export default {
+  name: 'SupplierExam',
+  mixins: [],
+  props: ['sitem'],
+  data() {
+    return {
+      formData: {
+        status: '4',
+        remark: '',
+        addr_code: '',
+        mobile: '',
+        contactor: ''
+      },
+      statusOptions: [
+        { value: '4', label: '确认修改' },
+        { value: '2', label: '不同意修改' }
+      ]
+    }
+  },
+  computed: {
+    displayExpressField() {
+      return this.formData.status === '4'
+    },
+    rules() {
+      const { status } = this.formData
+      return ({
+        addr: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '想输入详细地址'
+          }
+        ],
+        status: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择审核状态'
+          }
+        ],
+        remark: [
+          {
+            required: status === '2',
+            trigger: 'change',
+            message: '请输入备注'
+          }
+        ],
+        contactor: [
+          {
+            required: true,
+            trigger: 'blur',
+            validator: validatename
+          }
+        ],
+        mobile: [
+          {
+            required: true,
+            trigger: 'blur',
+            validator: validatemobile
+          }
+        ],
+        addr_code: [
+          {
+            type: 'array',
+            required: true,
+            trigger: 'change',
+            message: '请选择省市区'
+          }
+        ]
+      })
+    }
+  },
+  methods: {
+    addr_selectChange(e) {
+      this.formData.addr_code = e || []
+      this.$refs.formRef.validateField('addr_code')
+    },
+    submit() {
+      this.$refs.formRef.validate(isValid => {
+        if (!isValid) return
+        const { addr_code, status } = this.formData
+        let _status = status
+
+        if (status === '4' && String(this.sitem.is_receive) === '0') {
+          _status = '5'
+        }
+
+        const params = {
+          ...this.formData,
+          status: _status,
+          addr_code: addr_code ? addr_code.join(',') : ''
+        }
+
+        this.$emit('changeStatus', params)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.supplier-form{
+  ::v-deep(.el-form-item){
+    width: 400px;
+  }
+}
+</style>

src/views/supplierSellOut/sellAfterApply/components/supplier_exam.vue

@@ -63,7 +63,7 @@ const validatemobile = (rule, value, callback) => {
 export default {
   name: 'SupplierExam',
   mixins: [],
-  props: [],
+  props: ['sitem'],
   data() {
     return {
       formData: {
@@ -143,10 +143,17 @@ export default {
     submit() {
       this.$refs.formRef.validate(isValid => {
         if (!isValid) return
-        const { addr_code } = this.formData
+        const { addr_code, status } = this.formData
+
+        let _status = status
+
+        if (status === '4' && String(this.sitem.is_receive) === '0') {
+          _status = '5'
+        }
 
         const params = {
           ...this.formData,
+          status: _status,
           addr_code: addr_code ? addr_code.join(',') : ''
         }
 

src/views/supplierSellOut/sellAfterApply/components/wait-return.vue

@@ -40,7 +40,7 @@
 export default {
   name: 'SupplierExam',
   mixins: [],
-  props: [],
+  props: ['sitem'],
   data() {
     return {
       company: '',
@@ -105,8 +105,15 @@ export default {
       this.$refs.formRef.validate(isValid => {
         if (!isValid) return
 
+        let _status = this.formData.status
+
+        if (this.formData.status === '4' && String(this.sitem.is_receive) !== '0') {
+          _status = '5'
+        }
+
         const params = {
           ...this.formData,
+          status: _status,
           company: this.company
         }
 

src/views/supplierSellOut/sellAfterApply/detail.vue

@@ -93,42 +93,22 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item name="4" label="待采购审核" v-if="status + '' === '2'">
-              <purchase-exam />
+            <el-collapse-item name="4" title="供应商驳回，待采购审核" v-if="status + '' === '2'">
+              <purchase-exam :sitem="sitem" @changeStatus="handlePurchaseConfirm" />
             </el-collapse-item>
 
-            <el-collapse-item name="5" title="供应商审核"  v-if="status=== '9'">
-              <supplier-exam @changeStatus="handleSupplierExam" />
+            <el-collapse-item name="5" title="供应商审核"  v-if="status + '' === '9'">
+              <supplier-exam :sitem="sitem" @changeStatus="handleSupplierExam" />
             </el-collapse-item>
 
-            <el-collapse-item name="6" title="待客户退货" v-if="status === '4'">
-              <wait-return @changeStatus="handleExpress" />
+            <el-collapse-item name="6" title="待客户退货" v-if="status + '' === '4'">
+              <wait-return :sitem="sitem" @changeStatus="handleExpress" />
             </el-collapse-item>
-            
-            <!-- <el-collapse-item
-              title="采购审核"
-              name="4"
-              v-if="
-                (status == '2' ||
-                  status == '3' ||
-                  status == '4' ||
-                  status == '5' ||
-                  status == '7') &&
-                newTime != ''
-              "
-            >
-              <purchase-exam
-                :sitem="sitem"
-                :newTime="newTime"
-                v-if="newTime != ''"
-                @refresh="initData"
-              />
-            </el-collapse-item> -->
-
-            <!-- <el-collapse-item>
-              <supplier-exam />
-            </el-collapse-item> -->
 
+            <el-collapse-item name="7" title="业务公司修改待供应商确认" v-if="status + '' === '10'">
+              <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
+            </el-collapse-item>
+            
             <el-collapse-item
               title="设置退货仓库"
               name="4"
@@ -147,6 +127,8 @@
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
+
+        
         <el-tab-pane label="审批记录" name="2">
           <process-time-line
             v-if="newTime !== ''"
@@ -176,6 +158,7 @@ import purchaseExam from "./components/purchase_exam";
 import SupplierExam from "./components/supplier_exam.vue";
 import { xs_order_type_options } from "@/assets/js/statusList";
 import WaitReturn from "./components/wait-return.vue";
+import SupplierConfrim from "./components/supplier-confirm.vue";
 
 export default {
   name: "sellAfterApplyDetail",
@@ -184,7 +167,8 @@ export default {
     WaitReturn,
     SupplierExam,
     purchaseExam,
-    ExpressFeedback
+    ExpressFeedback,
+    SupplierConfrim
   },
   computed: {
     powers() {
@@ -236,24 +220,43 @@ export default {
       loading: false,
       // 收到货状态
       status1Options: [
+        // { 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: "3", label: "待设置仓库" }, // 废弃
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
-        { id: "7", label: "采购已驳回" },
+        { id: "7", label: "采购已驳回" }, // 废弃
         { id: "8", label: "申请已取消" },
+        { id: "9", label: "供应商审核" },
+        { id: "10", 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: "3", label: "待设置仓库" }, // 废弃
+        { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
-        { id: "7", label: "采购已驳回" },
+        { id: "7", label: "采购已驳回" }, // 废弃
         { id: "8", label: "申请已取消" },
+        { id: "9", label: "供应商审核" },
+        { id: "10", label: "业务公司修改待供应商确认" }
       ],
       orderCode: "",
       return_code: "",
@@ -284,7 +287,25 @@ export default {
         this.$message.warning(res.message);
       }
     },
-    
+
+    async handleSupplierConfirm(data){
+      let res = await asyncRequest.status({
+        ...data,
+        returnCode: this.code
+      });
+      
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: "修改成功！",
+          message: "",
+        });
+        await this.initData();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
     async handleSupplierExam(data){
       let res = await asyncRequest.status({
         ...data,
@@ -306,6 +327,26 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
+    async handlePurchaseConfirm(data){
+      const model = {
+        returnCode: this.code,
+        ...data
+      };
+
+      let res = await asyncRequest.status(model);
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: "修改成功！",
+          message: "",
+        });
+        await this.initData();
+        
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
     async statusConfirm(status, message, remark = "") {
       this.$confirm(`确定要${message}？`, {
         confirmButtonText: "确定",

src/views/supplierSellOut/sellAfterApply/index.vue

@@ -220,12 +220,13 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
+import companyHelper from "@/mixins/companyHelper"
 import { columns } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
   name: "sellAfterApply",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -457,6 +458,8 @@ export default {
       this.parmValue.company_name = this.select === "company_name" ? this.s_input : ""; // 申请人部门
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.supplierNo = this.currentCompany
+      
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierSellOut/sellOutOrder/index.vue

@@ -262,9 +262,11 @@ import addEdit from "./components/addEdit.vue";
 import { columns } from "./columns";
 import { shareWebUrl } from "@/config";
 import { xs_order_type_options } from "@/assets/js/statusList";
+import companyHelper from "@/mixins/companyHelper";
+
 export default {
   name: "sellOutOrder",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     addEdit,
   },
@@ -560,6 +562,8 @@ export default {
       }
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.supplierNo = this.currentCompany
+
 
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {

src/views/supplierSellOut/sellReturn/index.vue

@@ -156,13 +156,14 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper"
 import columns from "./columns";
 import asyncRequest from "@/apis/service/sellOut/sellReturn";
 import { mapGetters } from "vuex";
 
 export default {
   name: "sellReturn",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -363,6 +364,8 @@ export default {
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
+      // model.supplierNo = this.currentCompany
+
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/supplierWorkbench/workbench/index.vue

@@ -96,9 +96,10 @@ import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper";
 export default {
   name: "supplierWorkbench",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -285,7 +286,7 @@ export default {
     async searchList(type) {
       if (!this.loading) {
         this.loading = true;
-        const { code, data } = await asyncRequest.list(this.parmValue);
+        const { code, data } = await asyncRequest.list({...this.parmValue, supplierNo: this.currentCompany});
         if (code === 0) {
           const { list, count } = data;
           this.list = list;