暂存

src/views/sellOut/salesOrder/detail.vue

@@ -4,8 +4,10 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <div class="tl" style="padding: 10px 0 50px 0">
-        <span> {{ status }}----{{ powers }}</span>
+    <p><span> {{ status }}----{{ powers }}</span></p>
+      <div class="tl" style="height:60px; padding: 15px 0 0 0">
+        <span>销售订单编号：</span>
+        <span v-if="sitem">{{ sitem.orderCode }}</span>
         <el-button
           @click="statusConfirm('-1', '作废该条信息')"
           type="danger"
@@ -116,7 +118,7 @@
           <!-- && status == 3 && (status == 3 || status == 4)-->
           <order-out-table
             :newTime="newTime"
-            v-if="newTime !== '' "
+            v-if="newTime !== ''"
             :sitem="sitem"
             :id="queryId"
             @refresh="initData()"

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

@@ -9,79 +9,75 @@
     style="width: 100%"
     class="demo-ruleForm"
   >
-    <p>orderCode{{ sitem }}</p>
-    <p>disabled{{ disabled }}</p>
     <el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="发货总量" prop="send_num">
-            <el-input
-              disabled
-              v-model="ruleForm.send_num"
-              placeholder="发货总量"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="异常数量" prop="error_num">
-            <el-input
-              :disabled="disabled"
-              v-model="ruleForm.error_num"
-              placeholder="异常数量"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+      <el-col :span="8">
+        <el-form-item label="发货总量" prop="send_num">
+          <el-input
+            disabled
+            v-model="ruleForm.send_num"
+            placeholder="发货总量"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="异常数量" prop="error_num">
+          <el-input
+            :disabled="id !== 'add'"
+            v-model="ruleForm.error_num"
+            placeholder="异常数量"
+          ></el-input>
+        </el-form-item>
+      </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="期望意愿" prop="except_code">
-            <el-select
-              style="width: 100%"
-              :disabled="disabled"
-              v-model="ruleForm.except_code"
-              placeholder="期望意愿"
+      <el-col :span="8">
+        <el-form-item label="期望意愿" prop="except_code">
+          <el-select
+            style="width: 100%"
+            :disabled="id !== 'add'"
+            v-model="ruleForm.except_code"
+            placeholder="期望意愿"
+          >
+            <el-option
+              v-for="item in expect_options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             >
-              <el-option
-                v-for="item in expect_options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="异常原因" prop="error_code">
-            <el-select
-              style="width: 100%"
-              :disabled="disabled"
-              v-model="ruleForm.error_code"
-              placeholder="异常原因"
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="异常原因" prop="error_code">
+          <el-select
+            style="width: 100%"
+            :disabled="id !== 'add'"
+            v-model="ruleForm.error_code"
+            placeholder="异常原因"
+          >
+            <el-option
+              v-for="item in reason_options"
+              :key="item.id"
+              :label="item.result"
+              :value="item.result_code"
+              :disabled="item.status == 0"
             >
-              <el-option
-                v-for="item in reason_options"
-                :key="item.id"
-                :label="item.result"
-                :value="item.result_code"
-                :disabled="item.status == 0"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="16">
-          <el-form-item label="异常备注" prop="error_remark">
-            <el-input
-              type="textarea"
-              placeholder="请输入异常原因备注"
-              v-model="ruleForm.error_remark"
-              :disabled="disabled"
-              maxlength="250"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="16">
+        <el-form-item label="异常备注" prop="error_remark">
+          <el-input
+            type="textarea"
+            placeholder="请输入异常原因备注"
+            v-model="ruleForm.error_remark"
+            :disabled="id !== 'add'"
+            maxlength="250"
+            show-word-limit
+          />
+        </el-form-item>
+      </el-col>
 
       <el-col :span="24">
         <el-form-item label="异常图片" prop="error_img">
@@ -97,14 +93,14 @@
                 <i
                   class="el-icon-close"
                   @click="imgClose(index)"
-                  v-if="disabled"
+                  v-if="ruleForm.error_img.length < 5&&id === 'add'"
                 ></i>
               </li>
             </ul>
             <div
               class="btnupload"
               :style="getMargin()"
-              v-if="ruleForm.error_img.length < 5 && isShow"
+              v-if="ruleForm.error_img.length < 5&&id === 'add'"
               style="position: relative"
               @click="open"
             >
@@ -122,23 +118,12 @@
         </el-form-item>
       </el-col>
       <el-col :span="24" style="text-align: right">
-        <el-button
-          type="primary"
-          @click="submitForm"
-          v-if="
-            id === 'add' ||
-            (status === '0' && powers.some((item) => item == '005'))
-          "
+        <el-button type="primary" @click="submitForm" v-if="id === 'add'"
           >保 存</el-button
         >
-        <el-button
-          @click="closeAddEdit"
-          v-if="
-            id === 'add' ||
-            (status === '0' && powers.some((item) => item == '005'))
-          "
-          >{{ isDetail ? "关 闭" : "取 消" }}</el-button
-        ></el-col
+        <el-button @click="closeAddEdit" v-if="id === 'add'">{{
+          isDetail ? "关 闭" : "取 消"
+        }}</el-button></el-col
       >
     </el-row>
   </el-form>
@@ -344,7 +329,7 @@ export default {
               title,
               message: "",
             });
-  this.$emit("refresh", false);
+            this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

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

@@ -10,87 +10,78 @@
     class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="12" style="width: 370px; padding: 0 0 0 10px">
-        <el-form-item label="退回仓库" prop="wsm_supplierNo">
+      <el-col :span="12">
+        <el-form-item label="公司" prop="wsm_supplierNo">
           <search-supplier
             :size="searchSize"
             :value="ruleForm.wsm_supplierNo"
             :disabled="false"
+            :placeholder="'仓库所在公司'"
             :isDetail="false"
             @searchChange="supplierChange"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="12" style="width: 370px; padding: 0 0 0 20px">
-        <search-stock
-          :size="searchSize"
-          :value="ruleForm.wsm_code"
-          :placeholder="'退库仓库名称'"
-          :disabled="false"
-          :isDetail="false"
-          :isRelation="true"
-          :companyCode="ruleForm.wsm_supplier"
-          @searchChange="stockChange"
-        />
+      <el-col :span="12">
+        <el-form-item label="仓库" prop="wsm_code">
+          <search-stock
+            :size="searchSize"
+            :value="ruleForm.wsm_code"
+            :placeholder="'退库仓库'"
+            :disabled="false"
+            :isDetail="false"
+            :isRelation="true"
+            :companyCode="ruleForm.wsm_supplier"
+            @searchChange="stockChange"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col v-if="ruleForm.wsm_code && ruleForm.wsm_code.length === 1">
+        <el-col :span="12">
+          <el-form-item label="收件人">
+            <el-input
+              disabled
+              v-model="ruleForm.contactor"
+              placeholder="收件人"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="收件人电话">
+            <el-input
+              disabled
+              v-model="ruleForm.mobile"
+              placeholder="收件人电话"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="退回地址">
+            <el-input
+              disabled
+              v-model="ruleForm.addr"
+              maxlength="250"
+              placeholder="退回地址"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-col>
-
       <el-col :span="24" style="text-align: right; margin: 0 0 20px 0">
         <el-button type="primary" @click="submitForm" size="mini"
           >保 存</el-button
         >
-        <el-button
-          type="primary"
-          @click="statusConfirm('1', '发起审核流程')"
-          v-if="status === '0' && powers.some((item) => item == '012')"
-          >发起审核流程
-        </el-button>
-        <el-button
-          @click="statusConfirm('0', '取消审核流程')"
-          plain
-          v-if="status === '1' && powers.some((item) => item == '014')"
-          >取消审核流程</el-button
-        >
-        <el-button
-          @click="statusConfirm('-1', '作废该条信息')"
-          type="danger"
-          plain
-          v-if="
-            (status === '0' || status === '1') &&
-            powers.some((item) => item == '015')
-          "
-          >作废该条信息</el-button
-        >
-        <el-button
-          @click="statusConfirm('2', '通过审核')"
-          type="primary"
-          v-if="status === '1' && powers.some((item) => item == '016')"
-          >通过审核</el-button
-        >
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
-import { isMobile } from "@/utils/validate.js";
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import resToken from "@/mixins/resToken";
-import { isnumber } from "@/utils/validate.js";
 export default {
-  name: "purchase_check",
-  props: ["id", "showModelThis", "newTime", "orderCode"],
+  name: "sellAfterApplyDetail",
+  props: ["id", "newTime", "sitem"],
   mixins: [resToken],
   data() {
-    const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空！"));
-      } else {
-        if (!isMobile(value)) {
-          callback(new Error("手机号格式不正确！"));
-        } else {
-          callback();
-        }
-      }
-    };
     return {
       loading: false,
       status: "", //存储详情接口返的状态
@@ -105,6 +96,14 @@ export default {
       // 验证规则
       rules: {
         wsm_supplierNo: [
+          {
+            type: "array",
+            required: true,
+            trigger: "change",
+            message: "请选择仓库所在公司",
+          },
+        ],
+          wsm_code: [
           {
             type: "array",
             required: true,
@@ -124,7 +123,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchase_check"
+          (item) => item.menu_route == "sellAfterApplyDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -134,37 +133,21 @@ export default {
     },
   },
   watch: {
-    id: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
     newTime: function (val) {
       if (val) {
         this.initForm();
       }
     },
   },
+  mounted() {
+    this.initForm();
+  },
   methods: {
-    //   关闭弹窗,直接隐藏表单
-    // async closeAddEdit() {
-    //   this.$emit("closeModel", false); //抛出一个事件，关闭弹窗
-    //
-    // },
-    closeAdd() {
-      this.showModelThis = false;
-    },
     async initForm() {
       this.loading = true;
-      if (this.id === "add") {
-        this.status = "";
-        this.rulesThis = this.rules;
-        await this.resetForm();
-      } else {
-        this.rulesThis = this.rules;
-        await this.resetForm();
-        // await this.initData();
-      }
+      this.status = "";
+      this.rulesThis = this.rules;
+      await this.resetForm();
       this.loading = false;
     },
 
@@ -174,12 +157,23 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          this.status = "";
+          const {
+            status,
+            returnCode,
+            return_wsm,
+            addr,
+            mobile,
+            contactor,
+            wsm_supplierNo,
+          } = this.sitem;
+          this.status = status;
           this.ruleForm = {
-            wsm_supplier: "",
-            wsm_supplierNo: [],
-            wsm_code: [],
-            wsm_codeNo: "",
+            returnCode: returnCode || "",
+            wsm_code: return_wsm ? [return_wsm] : [],
+            wsm_supplierNo: wsm_supplierNo ? [wsm_supplierNo] : [],
+            contactor: contactor || "",
+            mobile: mobile || "",
+            addr: addr || "",
           };
         }
       });

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

@@ -111,7 +111,7 @@ import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate.js";
 export default {
-  name: "purchase_check",
+  name: "sellAfterApplyDetail",
   props: ["id", "showModelThis", "newTime"],
   mixins: [resToken],
   data() {
@@ -223,7 +223,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchase_check"
+          (item) => item.menu_route == "sellAfterApplyDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;

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

@@ -9,15 +9,16 @@
     style="width: 100%"
     class="demo-ruleForm"
   >
-    <p>退货单号{{ returnCode }}</p>
     <el-row>
       <el-col :span="12">
         <el-form-item label="费用承担方" prop="own">
           <el-select
-            clearable
             @change="handleChange"
             v-model="ruleForm.own"
-            placeholder="请选择"
+            placeholder="费用承担方"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '040'))
+            "
             style="width: 100%"
           >
             <el-option
@@ -29,36 +30,53 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物流公司" prop="express_company">
-          <search-express
-            :value="ruleForm.express_company"
-            :placeholder="'请选择退货物流'"
-            :names="''"
-            :disabled="false"
-            :is-detail="false"
-            @searchChange="handleCompany"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
         <el-form-item label="物流单号" prop="post_code">
           <el-input
-            placeholder="请输入物流单号"
+            placeholder="物流单号"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '040'))
+            "
             v-model="ruleForm.post_code"
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="isShow">
+      <el-col :span="12">
+        <el-form-item label="物流公司" prop="company">
+          <search-express
+            :value="ruleForm.company"
+            :placeholder="'物流公司'"
+            :names="''"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '040'))
+            "
+            :is-detail="
+              !(status === '3' && powers.some((item) => item == '040'))
+            "
+            @searchChange="handleCompany"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12" v-if="ruleForm.own === '2'">
         <el-form-item label="物流费用" prop="post_fee">
-          <el-input placeholder="请输入物流费用" v-model="ruleForm.post_fee">
+          <el-input
+            placeholder="物流费用"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '040'))
+            "
+            v-model="ruleForm.post_fee"
+          >
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="24" style="text-align: right; margin: 0 0 10px 0">
-        <el-button type="primary" @click="submitForm" v-if="true" size="mini"
+      <el-col
+        :span="24"
+        style="text-align: right; margin: 0 0 10px 0"
+        v-if="status === '3' && powers.some((item) => item == '040')"
+      >
+        <el-button type="primary" @click="submitForm" size="mini"
           >保 存</el-button
         >
       </el-col>
@@ -68,10 +86,10 @@
 <script>
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import resToken from "@/mixins/resToken";
-import { isAlphanumeric, isnumber } from "@/utils/validate.js";
+import { isAlphanumeric, isnumber, isnumber2 } from "@/utils/validate.js";
 export default {
-  name: "purchase_check",
-  props: ["id", "showModelThis", "newTime", "returnCode"],
+  name: "sellAfterApplyDetail",
+  props: ["id", "newTime", "sitem"],
   mixins: [resToken],
   data() {
     const validateexpress = (rule, value, callback) => {
@@ -89,10 +107,12 @@ export default {
       if (value === "") {
         callback(new Error("物流费用不能为空！"));
       } else {
-        if (!isnumber(value)) {
-          callback(new Error("物流费用只能为数字！"));
-        } else {
+        if (isnumber(value)) {
+          callback();
+        } else if (isnumber2(value)) {
           callback();
+        } else {
+          callback(new Error("物流费用仅支持整数及两位小数！"));
         }
       }
     };
@@ -115,9 +135,9 @@ export default {
       resign_name: "", //离职人
       hand_name: "", //交接人
       ruleForm: {
-        company: "", //入参快递公司
-        own: "", //物流费用承担方
-        express_company: [], //物流公司
+        returnCode: "",
+        own: "1", //物流费用承担方
+        company: [], //物流公司
         post_code: "", //物流单号
         post_fee: 0, //物流费用
       },
@@ -131,12 +151,12 @@ export default {
             message: "请选择物流费用承担方",
           },
         ],
-        express_company: [
+        company: [
           {
             type: "array",
             required: true,
             trigger: "change",
-            message: "请选择退回仓库",
+            message: "请选择物流公司",
           },
         ],
         post_code: [
@@ -160,7 +180,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchase_check"
+          (item) => item.menu_route == "sellAfterApplyDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -196,34 +216,35 @@ export default {
     },
     async initForm() {
       this.loading = true;
-      if (this.id === "add") {
-        this.status = "";
-        this.rulesThis = this.rules;
-        await this.resetForm();
-      } else {
-        this.rulesThis = this.rules;
-        await this.resetForm();
-        // await this.initData();
-      }
+      this.status = "";
+      this.rulesThis = this.rules;
+      await this.resetForm();
       this.loading = false;
     },
 
     async resetForm() {
-      this.resign_name = "";
-      this.hand_name = "";
-      this.status = "";
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.code = this.returnCode;
+          const {
+            returnCode,
+            post_own,
+            post_company,
+            post_code,
+            post_fee,
+            status,
+          } = this.sitem;
+          console.log(this.sitem);
+          this.status = status;
           this.ruleForm = {
-            own: "",
-            company: "", //入参快递公司
-            express_company: [], //物流公司
-            post_code: "", //物流单号
-            post_fee: 0, //物流费用
+            returnCode: returnCode || "",
+            own: post_own || "1",
+            company: post_company ? [post_company] : [], //物流公司
+            post_code: post_code || "", //物流单号
+            post_fee: post_fee || "0", //物流费用
           };
         }
       });
@@ -232,8 +253,9 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.returnCode = this.code;
-          delete model["express_company"];
+          // model.returnCode = this.code;
+          // delete model["company"];
+          model.company = model.company[0];
           const res = await asyncRequest.afterPost(model); //售后快递录入
           this.loading = false;
           if (res && res.code === 0) {
@@ -256,8 +278,8 @@ export default {
     handleCompany(e) {
       console.log(e);
       if (e && e.code) {
-        this.ruleForm.company = e.shortName;
-        this.ruleForm.express_company = [e.code];
+        // this.ruleForm.company = e.shortName;
+        this.ruleForm.company = [e.label];
       }
     },
     handleChange(e) {

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

@@ -127,7 +127,7 @@ import { isMobile } from "@/utils/validate.js";
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import resToken from "@/mixins/resToken";
 export default {
-  name: "supplier_feedback",
+  name: "sellAfterApplyDetail",
   props: ["id", "showModelThis", "newTime"],
   mixins: [resToken],
   data() {
@@ -225,7 +225,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "supplier_feedback"
+          (item) => item.menu_route == "sellAfterApplyDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;

src/views/sellOut/sellAfterApply/serviceDetail.vue → src/views/sellOut/sellAfterApply/detail.vue

@@ -4,13 +4,16 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
+      <p>{{ status }}---{{ powers }}</p>
+      <span>销售售后申请编号：</span>
+      <span v-if="sitem">{{ sitem.returnCode }}</span>
       <el-button
         style="margin: 10px 0 20px 0"
         type="primary"
         plain
         :size="'mini'"
         @click="statusConfirm('1', '发起审核流程', '')"
-        v-if="s_status === '0' && powers.some((item) => item == '012')"
+        v-if="status === '0' && powers.some((item) => item == '012')"
         >发起审核流程
       </el-button>
       <status-bar
@@ -18,7 +21,7 @@
         v-if="newTime !== ''"
         :newTime="newTime"
         :options="statusOptions"
-        :status="s_status"
+        :status="status"
       />
       <el-collapse v-model="activeNames">
         <el-collapse-item title="售后申请详情" name="1">
@@ -31,10 +34,9 @@
         <el-collapse-item
           title="业务审核"
           name="1"
-          v-if="powers.some((item) => item == '034')"
+          v-if="status === '0' && powers.some((item) => item == '034')"
         >
           <exam-form
-            v-if="s_status === '1'"
             :statusList="statusList"
             :newTime="newTime"
             :disabled="false"
@@ -45,25 +47,30 @@
         <el-collapse-item
           title="物流反馈"
           name="2"
-          v-if="powers.some((item) => item == '040')"
+          v-if="
+            (status == '2' && powers.some((item) => item == '040')) ||
+            status == '3' ||
+            status == '4' ||
+            status == '5'
+          "
         >
           <express-feedback
+            :sitem="sitem"
             :newTime="newTime"
-            :orderCode="orderCode"
+            v-if="newTime != ''"
             @refresh="initData"
-            :returnCode="returnCode"
-            v-if="s_status == '2'"
           ></express-feedback>
         </el-collapse-item>
         <el-collapse-item
           title="退货物流"
           name="4"
-          v-if="powers.some((item) => item == '040')"
+          v-if="status == '3' ||status == '4'"
         >
           <return-express
             @refresh="initData(true)"
-            :returnCode="orderCode"
-            v-if="s_status == '3'"
+            :sitem="sitem"
+            :newTime="newTime"
+            v-if="newTime != ''"
           ></return-express>
         </el-collapse-item>
         <el-collapse-item title="审批记录" name="10">
@@ -84,16 +91,13 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-// import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
-
-import addEditForm from "./components/addEditForm.vue";
-import ExpressFeedback from "./components/express_feedback.vue";
-
+import addEditForm from "./components/addEditForm";
+import ExpressFeedback from "./components/express_feedback";
 import PurchaseCheck from "./components/purchase_check";
 import ReturnExpress from "./components/returnExpress";
 export default {
-  name: "serviceDetail",
+  name: "sellAfterApplyDetail",
   mixins: [mixinPage, resToken],
   components: {
     addEditForm,
@@ -105,7 +109,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "serviceDetail"
+          (item) => item.menu_route == "sellAfterApplyDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -117,7 +121,7 @@ export default {
   data() {
     return {
       activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"],
-      s_status: "", //存储详情接口状态
+      status: "", //存储详情接口状态
       statusList: [],
       sitem: null,
       newTime: "",
@@ -197,7 +201,7 @@ export default {
       };
       const res = await asyncRequest.detail(model);
       if (res && res.code === 0 && res.data) {
-        this.s_status = res.data.status;
+        this.status = res.data.status;
         this.sitem = res.data;
         this.orderCode = res.data.returnCode;
         this.getNewTime();

src/views/sellOut/sellAfterApply/index.vue

@@ -193,7 +193,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('serviceDetail', { id: scope.row.returnCode })"
+              @click="routeGoto('sellAfterApplyDetail', { id: scope.row.returnCode })"
             ></i>
           </el-tooltip>
         </template>

src/views/sellOut/sellAfterApply/serviceDetail copy.vue

@@ -1,109 +0,0 @@
-<template>
-  <div class="purchaseOrderDetail pagePadding">
-    <div
-      style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
-      <div class="detail-page-title">
-        <span class="title">售后申请详情</span>
-        <add-edit-form :sitem="sitem"></add-edit-form>
-      </div>
-      powers：{{ powers }}status{{ status }}
-      <el-collapse v-model="activeNames">
-        <el-collapse-item
-          title="业务审核"
-          name="1"
-          v-if="powers.some((item) => item == '034')"
-        >
-          <exam-form
-            :statusList="statusList"
-            :newTime="newTime"
-            :disabled="false"
-            :isMust="false"
-            @searchChange="examForm"
-          />
-        </el-collapse-item>
-        <el-collapse-item
-          title="供应商反馈"
-          name="2"
-          v-if="powers.some((item) => item == '035')"
-        >
-        
-          <supplier-feedback></supplier-feedback>
-        </el-collapse-item>
-        <el-collapse-item
-          title="采购审核"
-          name="3"
-          v-if="powers.some((item) => item == '036')"
-        >
-          <purchase-check></purchase-check>
-        </el-collapse-item>
-        <el-collapse-item
-          title="退货物流"
-          name="4"
-          v-if="powers.some((item) => item == '032')"
-        >
-          <return-express></return-express>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div v-else>
-      <no-auth></no-auth>
-    </div>
-  </div>
-</template>
-   <script>
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-// import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
-import addEditForm from "./components/addEditForm.vue";
-import SupplierFeedback from "./components/supplier_feedback.vue";
-import PurchaseCheck from "./components/purchase_check";
-import ReturnExpress from "./components/returnExpress";
-export default {
-  name: "serviceDetail",
-  mixins: [mixinPage, resToken],
-  components: {
-    addEditForm,
-    SupplierFeedback,
-    PurchaseCheck,
-    ReturnExpress,
-  },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "serviceDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      activeNames: ["0", "1", "2", "3", "4"],
-      sitem: null,
-      statusList: [],
-      sitem: null,
-      newTime: "",
-      loading: false,
-    };
-  },
-  mounted() {
-    this.sitem = this.$route.query.id;
-  },
-  methods: {
-    getNewTime() {
-      this.newTime = new Date().valueOf();
-    },
-    examForm(e) {
-      console.log(e);
-    },
-  },
-};
-</script>
-   
-   

src/views/sellOut/sellOutOrder/detail.vue

@@ -5,7 +5,9 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <div class="tl" style="height: 50px; padding: 10px 0 0 0">
-        <p>{{ status }}---ssss{{ powers }}</p>
+        <p>{{ status }}---{{ powers }}</p>
+        <span>销售订单编号：</span>
+        <span v-if="sitem">{{ sitem.outCode }}</span>
         <el-button
           class="fr"
           v-if="status === '2' && powers.some((item) => item == '049')"