暂存

src/assets/js/btnList.js

@@ -45,7 +45,11 @@ const btnList = [
   { code: "044", name: "通知业务部门" },
   { code: "045", name: "填写物流" },
   { code: "046", name: "供应商反馈" },
-
-  
+  { code: "047", name: "退货验收记录" },
+  { code: "048", name: "添加出库单" },
+  { code: "049", name: "添加售后申请" },
+  { code: "050", name: "添加售后退货" },
+  { code: "051", name: "添加未发货退货" },
+  { code: "052", name: "客户验收" },
 ];
 export default btnList;

src/components/globalComponents/exam-form/main.vue

@@ -10,7 +10,7 @@
     :size="size || 'medium'"
   >
     <el-row>
-      <el-col :span="11"
+      <el-col :span="12"
         ><el-form-item label="审核状态" prop="state">
           <el-radio-group
             v-model="ruleForm.state"

src/views/interest/action/index.vue

@@ -688,7 +688,7 @@ export default {
                 color: #97a8be;
                 ._h2 {
                   display: inline-block;
-                  width: 100px;
+                  // width: 100px;
                 }
               }
               .scheck {

src/views/interest/handover/components/addEditForm.vue

@@ -249,12 +249,7 @@ export default {
               message: "",
             });
 
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+           this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/interest/role/addEdit.vue

@@ -715,7 +715,7 @@ export default {
               color: #97a8be;
               ._h2 {
                 display: inline-block;
-                width: 100px;
+                // width: 100px;
               }
             }
             .scheck {

src/views/sellOut/returnOrder/components/returnCheck.vue

@@ -8,9 +8,7 @@
         :size="'mini'"
         class="demo-tableForm errorlist"
       >
-        <!-- {{ tableForm.errorlist }} -->
-        <!-- <p>{{ sitem }}</p> -->
-        <el-form-item label="入库情况">
+ 
           <el-table
             :data="tableForm.errorlist"
             border
@@ -137,7 +135,6 @@
               >保 存
             </el-button>
           </el-col>
-        </el-form-item>
       </el-form>
     </el-col>
   </el-row>

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

@@ -344,13 +344,7 @@ export default {
               title,
               message: "",
             });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+  this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

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

@@ -316,12 +316,7 @@ export default {
               message: "",
             });
 
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+             this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sellOut/sellOutOrder/components/addEditFormA.vue

@@ -364,13 +364,7 @@ export default {
               title,
               message: "",
             });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+  this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sellOut/sellOutOrder/components/addEdit_sellForm.vue

@@ -147,6 +147,8 @@
 import { isnumber } from "@/utils/validate.js";
 import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
 import resToken from "@/mixins/resToken";
+
+//组件重写 组件内部重复调用
 export default {
   name: "sellAfterApplyDetail",
   props: ["id", "sitem", "showModelThis", "newTime", "orderCode", "outCode"],
@@ -302,6 +304,7 @@ export default {
             outCode,
             send_num,
           } = this.sitem;
+
           this.ruleForm = {
             outCode: outCode || "", //出库单编号
             error_num: error_num || "", //异常数量

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

@@ -315,13 +315,7 @@ export default {
               title,
               message: "",
             });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+  this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sellOut/sellReturnList/components/returnCheck copy.vue

@@ -381,12 +381,7 @@ export default {
               message: "",
             });
 
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+          this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sellOut/sellReturnList/components/returnCheck.vue

@@ -327,12 +327,7 @@ export default {
               message: "",
             });
 
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+           this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sheetOrder/zxAfterSale/columns.js

@@ -17,22 +17,22 @@ export default [
   {
     prop: "outCode",
     label: "销售出库单编号",
-    width: "150"
+    "min-width": "150"
   },
   {
     prop: "total_num",
     label: "出库单商品数量",
-    width: "105"
+    "min-width": "105"
   },
   {
     prop: "good_code",
     label: "商品编码",
-    width: "125"
+    "min-width": "125"
   },
   {
     prop: "good_name",
     label: "商品名称",
-    width: "150"
+    "min-width": "150"
   },
   // {
   //   prop: "error_num",

src/views/sheetOrder/zxAfterSale/components/addEditForm.vue

@@ -352,13 +352,7 @@ export default {
               title,
               message: "",
             });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+  this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sheetOrder/zxAfterSale/components/purchase_check.vue

@@ -14,6 +14,7 @@
         <el-form-item label="退回至" prop="wsm_code">
           <el-select
             style="width: 100%"
+            :disabled="!(status == '2' && powers.some((item) => item == '036'))"
             v-model="ruleForm.wsm_code"
             placeholder="退回至"
             @change="handleStore"
@@ -59,7 +60,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="24" style="text-align: right">
+      <el-col :span="24" style="text-align: right;padding:0 0  20px 0"  v-if="status == '2' && powers.some((item) => item == '036')">
         <el-button type="primary" :size="'mini'" @click="submitForm" v-if="true"
           >保 存</el-button
         >
@@ -71,7 +72,7 @@
 import asyncRequest from "@/apis/service/sheetOrder/zxAfterSale";
 import resToken from "@/mixins/resToken";
 export default {
-  name: "purchase_check",
+  name: "zxAfterSaleDetail",
   props: ["id", "sitem", "newTime"],
   mixins: [resToken],
   data() {
@@ -102,7 +103,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchase_check"
+          (item) => item.menu_route == "zxAfterSaleDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;

src/views/sheetOrder/zxAfterSale/components/returnExpress.vue

@@ -9,13 +9,13 @@
     style="width: 100%"
     class="demo-ruleForm"
   >
-    {{ returnCode }}
     <el-row>
       <el-col :span="12">
         <el-form-item label="物流承担方" prop="own">
           <el-select
             v-model="ruleForm.own"
             placeholder="物流承担方"
+            :disabled="!(status == '3' && powers.some((item) => item == '045'))"
             style="width: 100%"
           >
             <el-option
@@ -33,9 +33,11 @@
           <search-express
             :value="ruleForm.company"
             :placeholder="'物流公司'"
-            :names="''"
-            :disabled="false"
-            :is-detail="false"
+            :names="post_company"
+            :disabled="!(status == '3' && powers.some((item) => item == '045'))"
+            :is-detail="
+              !(status == '3' && powers.some((item) => item == '045'))
+            "
             @searchChange="handleCompany"
           />
         </el-form-item>
@@ -44,21 +46,30 @@
         <el-form-item label="物流单号" prop="post_code">
           <el-input
             placeholder="物流单号"
+             :disabled="
+              !(status == '3' && powers.some((item) => item == '045'))
+            "
             v-model="ruleForm.post_code"
           ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="ruleForm.own === '2' || ruleForm.own === '3'">
         <el-form-item label="物流费用" prop="post_fee">
-          <el-input placeholder="物流费用" v-model="ruleForm.post_fee">
+          <el-input
+            :disabled="!(status == '3' && powers.some((item) => item == '045'))"
+            placeholder="物流费用"
+            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">
-        <el-button type="primary" :size="'mini'" @click="submitForm" v-if="true"
+      <el-col
+        :span="24"
+        style="text-align: right; padding: 0 0 20px 0"
+        v-if="status == '3' && powers.some((item) => item == '045')"
+      >
+        <el-button type="primary" :size="'mini'" @click="submitForm"
           >保 存</el-button
         >
       </el-col>
@@ -68,11 +79,32 @@
 <script>
 import asyncRequest from "@/apis/service/sheetOrder/zxAfterSale";
 import resToken from "@/mixins/resToken";
-import { isAlphanumeric, isnumber } from "@/utils/validate.js";
+import { isAlphanumeric, isnumber } from "@/utils/validate";
 export default {
-  name: "purchase_check",
+  name: "zxAfterSaleDetail",
   props: ["newTime", "sitem"],
   mixins: [resToken],
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "zxAfterSaleDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
   data() {
     const validateexpress = (rule, value, callback) => {
       if (value === "") {
@@ -100,6 +132,7 @@ export default {
     };
     return {
       options: [],
+      post_company:"",
       smodel: {
         value: "3",
         label: "供应商承担",
@@ -153,30 +186,10 @@ export default {
       },
     };
   },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchase_check"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
 
   mounted() {
     this.initForm();
   },
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
   methods: {
     closeAdd() {
       this.showModelThis = false;
@@ -206,17 +219,27 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { company, post_code, post_fee, returnCode, own,is_th } = this.sitem;
+          const {
+            post_company,
+            post_code,
+            post_fee,
+            returnCode,
+            own,
+            is_th,
+            status,
+          } = this.sitem;
+          this.status = status;
           this.code = this.returnCode;
+          this.post_company=post_company
           this.ruleForm = {
             returnCode: returnCode || "",
             own: own || "1", //入参快递公司
-            company: company ? [company] : [], //物流公司
+            company: post_company ? [post_company] : [], //物流公司
             post_code: post_code || "", //物流单号
             post_fee: post_fee || "0", //物流费用
           };
-          if(is_th==='1'){
-            this.options.push(this.smodel)
+          if (is_th === "1") {
+            this.options.push(this.smodel);
           }
         }
       });

src/views/sheetOrder/zxAfterSale/components/supplier_feedback.vue

@@ -15,7 +15,9 @@
           <el-form-item label="是否同意" prop="is_th">
             <el-select
               style="width: 100%"
-              :disabled="!(status === '1')"
+              :disabled="
+                !(status == '1' && powers.some((item) => item == '046'))
+              "
               v-model="ruleForm.is_th"
               placeholder="是否同意退回"
             >
@@ -35,7 +37,9 @@
             <el-input
               type="textarea"
               placeholder="反馈备注"
-              :disabled="!(status === '1')"
+              :disabled="
+                !(status == '1' && powers.some((item) => item == '046'))
+              "
               v-model="ruleForm.remark"
               maxlength="250"
               show-word-limit
@@ -47,7 +51,9 @@
         <el-col :span="12">
           <el-form-item label="收件人" prop="contactor">
             <el-input
-              :disabled="!(status === '1')"
+              :disabled="
+                !(status == '1' && powers.some((item) => item == '046'))
+              "
               v-model="ruleForm.contactor"
               placeholder="收件人"
             ></el-input>
@@ -56,7 +62,9 @@
         <el-col :span="12">
           <el-form-item label="收件人电话" prop="mobile">
             <el-input
-              :disabled="!(status === '1')"
+              :disabled="
+                !(status == '1' && powers.some((item) => item == '046'))
+              "
               v-model="ruleForm.mobile"
               placeholder="收件人电话"
             ></el-input>
@@ -66,7 +74,9 @@
           <el-form-item label="地址省市区" prop="addr_code">
             <select-area
               :placeholder="'省市区'"
-              :disabled="!(status === '1')"
+              :disabled="
+                !(status == '1' && powers.some((item) => item == '046'))
+              "
               :value="ruleForm.addr_code"
               :is-detail="id !== 'add'"
               @selectChange="selectAreaAddr_code"
@@ -77,14 +87,20 @@
           <el-form-item label="详细地址" prop="addr">
             <el-input
               v-model="ruleForm.addr"
-              :disabled="!(status === '1')"
+              :disabled="
+                !(status == '1' && powers.some((item) => item == '046'))
+              "
               placeholder="详细地址"
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
-      <el-col :span="24" style="text-align: right" v-if="status === '1'">
+      <el-col
+        :span="24"
+        style="text-align: right;padding:0 0 20px 0;"
+        v-if="status == '1' && powers.some((item) => item == '046')"
+      >
         <el-button type="primary" :size="'mini'" @click="submitForm"
           >保 存</el-button
         >
@@ -114,7 +130,7 @@ export default {
     };
     return {
       loading: false,
-      status: "", 
+      status: "",
       showModelThis: this.showModel,
       ruleForm: {
         is_th: "1", //是否同意退回
@@ -212,7 +228,7 @@ export default {
       this.showModelThis = false;
     },
     async initForm() {
-      this.status=""
+      this.status = "";
       this.loading = true;
       this.rulesThis = this.rules;
       await this.resetForm();
@@ -236,7 +252,7 @@ export default {
             status,
           } = this.sitem;
           let list = [];
-          this.status=status
+          this.status = status;
           if (
             addr_code &&
             addr_code.area_code &&

src/views/sheetOrder/zxAfterSale/detail.vue

@@ -1,10 +1,14 @@
 <template>
-  <div class="purchaseOrderDetail pagePadding">
+  <div class="zxAfterSaleDetail pagePadding">
     <div
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <p>{{ status }}----{{ powers }}</p>
+      <p>{{ status }}---{{ powers }}</p>
+      <div class="tl" style="padding: 15px 0 22px 0">
+        <span>咨询售后申请编号：</span>
+        <span v-if="sitem">{{ sitem.returnCode }}</span>
+      </div>
       <status-bar
         v-if="newTime !== ''"
         :newTime="newTime"
@@ -36,7 +40,13 @@
         <el-collapse-item
           title="供应商反馈"
           name="2"
-          v-if="powers.some((item) => item == '046')"
+          v-if="
+            (status == '1' && powers.some((item) => item == '046')) ||
+            status == '2' ||
+            status == '3' ||
+            status == '4' ||
+            status == '5'
+          "
         >
           <supplier-feedback
             v-if="newTime != ''"
@@ -45,7 +55,17 @@
             @refresh="initData()"
           />
         </el-collapse-item>
-        <el-collapse-item title="采购审核" name="3">
+
+        <el-collapse-item
+          title="采购审核"
+          name="3"
+          v-if="
+            (status == '2' && powers.some((item) => item == '036')) ||
+            status == '3' ||
+            status == '4' ||
+            status == '5'
+          "
+        >
           <purchase-check
             v-if="newTime != ''"
             :sitem="sitem"
@@ -53,8 +73,11 @@
             @refresh="initData()"
           />
         </el-collapse-item>
-        <!-- v-if="powers.some((item) => item == '040')" -->
-        <el-collapse-item title="填写物流" name="4">
+        <el-collapse-item title="填写物流" name="4"   v-if="
+            (status == '3' && powers.some((item) => item == '045')) ||
+            status == '4' ||
+            status == '5'
+          ">
           <return-express
             v-if="newTime != ''"
             :sitem="sitem"
@@ -122,8 +145,8 @@ export default {
         { value: "1", label: "物流信息反馈" },
         // { value: "2", label: "反馈物流费" },
         { value: "3", label: "填写退货信息" },
-        { value: "4", label: "已退货" },
-        // { value: "5", label: "已发货" },
+        // { value: "4", label: "已退货" },
+        { value: "5", label: "售后退货单创建成功" },
       ],
       orderCode: "",
       return_code: "",

src/views/sheetOrder/zxAfterSaleOrder/columns.js

@@ -1,43 +1,147 @@
+// export default [
+//   {
+//     prop: "thNo",
+//     label: "售后退货单编号",
+//     width: "160"
+//   },
+
+//   {
+//     prop: "status",
+//     label: "状态",
+//     _slot_: "status",
+//     width: "120px",
+//   },
+
+//   {
+//     prop: "customer_code",
+//     label: "客户编号",
+//     width: "125"
+//   },
+//   {
+//     prop: "return_num",
+//     label: "退货数量",
+//   },
+//   {
+//     prop: "normal_num",
+//     label: "正常数量",
+//   },
+//   {
+//     prop: "received_num",
+//     label: "收货数量",
+//   },
+
+
+
+ 
+//   {
+//     prop: "",
+//     label: "操作",
+//     fixed: "right",
+//     width: 50,
+//     _noset_: true,
+//     _slot_: "operation",
+//   },
+
+// ]
+
 export default [
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    width:"160"
+  },
   {
     prop: "thNo",
-    label: "售后退货单编号",
-    width: "160"
+    label: "退货单编号",
+    width:"160"
   },
+  // {确认单编号}
+  // {order_type类型}
+ 
 
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: "outCode",
+    label: "出库单编号",
+    width:"160"
+
   },
+  {
+    prop: "returnCode",
+    label: "售后单编号",
+    width:"160"
 
+  },
   {
-    prop: "customer_code",
+    prop: "customer_code",   
     label: "客户编号",
-    width: "125"
+    width:"140"
+
   },
   {
     prop: "return_num",
     label: "退货数量",
   },
   {
-    prop: "normal_num",
-    label: "正常数量",
+      prop:"normal_num",
+      label:"正常数量",
   },
   {
-    prop: "received_num",
-    label: "收货数量",
+      prop:"received_num",
+      label:"收货数量",
+  },
+  // {
+  //   prop: "contactor",
+  //   label: "收货人",
+  // },
+  // {
+  //   prop: "mobile",
+  //   label: "联系电话",
+  // },
+  // {
+  //   prop: "addr",
+  //   label: "收货人地址",
+  // },
+  // {地址code}
+  {
+    prop: "post_fee",
+    label: "邮费",
+  },
+  {
+    prop: "post_code",
+    label: "快递单号",
+    width:"160"
+  },
+   {
+    prop: "post_company",
+    label: "物流公司",
   },
 
-
-
- 
+  {
+      prop:"good_code",
+      label:"商品属性编号",
+      width:"150"
+  },
+  {
+      prop:"good_name",
+      label:"商品名称",
+      width:"150"
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "130px",
+  },
+  {
+    prop: "addtime",
+    label: "申请时间",
+    sortable: true,
+    width:142
+  },
   {
     prop: "",
     label: "操作",
     fixed: "right",
-    width: 50,
     _noset_: true,
     _slot_: "operation",
   },

src/views/sheetOrder/zxAfterSaleOrder/components/columns.js

@@ -1,55 +1,20 @@
 
 export default {
   tableFormThis: {
-    type_code: [
+    check_remark: [
       {
         required: false,
         message: "",
         trigger: "blur",
       },
     ],
-    good_name: [
+    check_value: [
       {
-        required: false,
-        message: "",
-        trigger: "blur",
-      },
-    ],
-    usable_num: [
-      {
-        required: false,
-        message: "",
-        trigger: "blur",
-      },
-    ],
-    allot_num: [
-      {
-        required: false,
-        message: "",
-        trigger: "blur",
-      },
-    ],
-    error_num: [
-      {
-        required: false,
-        message: "",
-        trigger: "blur",
-      },
-    ],
-    error_code: [
-      {
-        required: false,
+        required: true,
         message: "",
         trigger: "change",
       },
     ],
-    error_remark: [
-      {
-        required: false,
-        message: "",
-        trigger: "blur",
-      },
-    ],
   },
   columns: [
     // 表格 - 列参数

src/views/sheetOrder/zxAfterSaleOrder/components/return-record.vue

@@ -9,7 +9,6 @@
     style="width: 100%"
     class="demo-ruleForm"
   >
-    <p>sitem:{{ status }}</p>
     <el-row>
       <el-col :span="12">
         <el-form-item label="退货总数量" prop="return_num">
@@ -23,6 +22,7 @@
       <el-col :span="12">
         <el-form-item label="可销售数量" prop="normal">
           <el-input
+            :disabled="!(status==='0'&&powers.some((item) => item == '047'))"
             v-model="ruleForm.normal"
             placeholder="可销售数量"
           ></el-input>
@@ -31,6 +31,7 @@
       <el-col :span="24">
         <el-form-item label="其他备注" prop="remark">
           <el-input
+            :disabled="!(status==='0'&&powers.some((item) => item == '047'))"
             type="textarea"
             maxlength="250"
             show-word-limit
@@ -56,14 +57,16 @@
               row-key="key"
             >
               <el-table-column label="异常数量" prop="error_num" />
-
               <el-table-column label="异常原因" prop="error_code_name" />
-
               <el-table-column label="异常备注" prop="error_remark" />
-
-              <el-table-column fixed="right" label="操作" width="80">
+              <el-table-column
+                fixed="right"
+                label="操作"
+                width="80"
+                v-if="status==='0'&&powers.some((item) => item == '047')"
+              >
                 <template slot="header" slot-scope="scope">
-                    <!-- v-if="status == '1' || status == '0'" -->
+                  <!-- v-if="status == '1' || status == '0'" -->
                   <span>操作</span>
                   <el-tooltip
                     class="fr"
@@ -73,18 +76,14 @@
                     placement="top"
                   >
                     <i
-                    
                       class="el-icon-circle-plus-outline tb-icon"
                       style="color: #63cbe7"
                       @click="openModal(-1)"
                     ></i>
                   </el-tooltip>
                 </template>
-                 <!-- v-if="status == '1' || status == '0'" -->
-                <template
-                  slot-scope="scope"
-                 
-                >
+                <!-- v-if="status == '1' || status == '0'" -->
+                <template slot-scope="scope">
                   <el-tooltip
                     effect="dark"
                     content="编辑"
@@ -114,17 +113,12 @@
           </el-form>
         </el-form-item>
       </el-col>
-    </el-row>
-
-    <el-row>
-      <el-col :span="24" style="text-align: right; margin: 10px 0 20px 0">
-         <!-- v-if="status == '0' || status == '1'" -->
-        <el-button
-         
-          type="primary"
-          class="fr"
-          :size="'mini'"
-          @click="submitForm"
+      <el-col
+        :span="24"
+        style="text-align: right; margin: -5px 0 20px 0"
+        v-if="status==='0'&&powers.some((item) => item == '047')"
+      >
+        <el-button type="primary" class="fr" :size="'mini'" @click="submitForm"
           >保 存
         </el-button>
       </el-col>
@@ -145,7 +139,7 @@ import { isnumber } from "@/utils/validate";
 import addEdit from "./addEdit";
 import addEditModel from "./addEditModel";
 export default {
-  name: "returnRecord",
+  name: "zxAfterSaleOrderDetail",
   props: ["id", "showModelThis", "newTime", "sitem"],
   mixins: [resToken],
   components: { addEdit, addEditModel },
@@ -174,11 +168,9 @@ export default {
         product_go: [], //表格参数
       },
 
-      // --
       btn_code: "",
       modelId: "",
       options: [],
-      voList: [],
       edit: false, //默认不能提交
       totalNumber: 0, //全局保存数量
       loading: false,
@@ -216,7 +208,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "returnRecord"
+          (item) => item.menu_route == "zxAfterSaleOrderDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -259,6 +251,7 @@ export default {
             child && child.length > 0 ? JSON.parse(JSON.stringify(child)) : [];
           this.arr.forEach((v) => {
             v.is_del = "0";
+            v.error_code_name=v.error_msg
           });
           this.ruleForm = {
             return_num: return_num || "",
@@ -277,7 +270,7 @@ export default {
 
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           let list = JSON.parse(JSON.stringify(this.arr));
-          let { return_num, normal, product_go,remark } = model;
+          let { return_num, normal, product_go, remark } = model;
           let errorT = 0;
           if (product_go && product_go.length > 0) {
             product_go.forEach((v) => {
@@ -328,7 +321,7 @@ export default {
         page: 1,
         size: 100,
         type: "1",
-        status: "3",
+        // status: "3",
       });
       if (res && res.code === 0 && res.data) {
         const { list } = res.data;

src/views/sheetOrder/zxAfterSaleOrder/components/returnCheck.vue

@@ -8,143 +8,106 @@
         :size="'mini'"
         class="demo-tableForm product_go"
       >
-        <el-form-item label="入库情况">
-          <el-table
-            :data="tableForm.product_go"
-            border
-            :size="'mini'"
-            row-key="key"
-          >
-            <el-table-column label="异常数量">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'product_go.' + scope.$index + '.anomalous_numbers'"
-                >
-                  <p>
-                    {{ scope.row.anomalous_numbers }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="异常原因">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'product_go.' + scope.$index + '.anomalous_reason'"
-                >
-                  <p>{{ scope.row.anomalous_reason }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="异常备注">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'product_go.' + scope.$index + '.anomalous_remark'"
+        <el-table
+          :data="tableForm.product_go"
+          border
+          :size="'mini'"
+         row-key="key"
+        >
+          <el-table-column label="异常数量" prop="anomalous_numbers" />
+          <el-table-column label="异常原因" prop="anomalous_reason" />
+          <el-table-column label="异常备注" prop="anomalous_remark" />
+          <el-table-column label="审核情况" prop="check_value">
+            <template slot-scope="scope">
+              <el-form-item
+                :style="!scope.row.edit ? 'margin:0' : ''"
+                :size="'mini'"
+                :prop="'product_go.' + scope.$index + '.check_value'"
+                :rules="tableFormThis.check_value"
+              >
+                <el-select
+                  :disabled="!scope.row.edit"
+                  style="width: 100%"
+                  v-model="scope.row.check_value"
+                  placeholder="审核情况"
                 >
-                  <p>{{ scope.row.anomalous_remark }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="审核情况">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'product_go.' + scope.$index + '.check_value'"
-                >
-                  <el-select
-                    :disabled="!scope.row.edit"
-                    style="width: 100%"
-                    v-model="scope.row.check_value"
-                    placeholder="审核情况"
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                   >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="审核备注">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'product_go.' + scope.$index + '.check_remark'"
-                  :rules="{
-                    required: true,
-                    message: '审核备注不能为空',
-                    trigger: 'blur',
-                  }"
-                >
-                  <el-input
-                    :disabled="!scope.row.edit"
-                    v-model="scope.row.check_remark"
-                  ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核备注" prop="check_remark">
+            <template slot-scope="scope">
+              <el-form-item
+                :style="!scope.row.edit ? 'margin:0' : ''"
+                :size="'mini'"
+                :prop="'product_go.' + scope.$index + '.check_remark'"
+                :rules="tableFormThis.check_remark"
+              >
+                <el-input
+                  :disabled="!scope.row.edit"
+                  v-model="scope.row.check_remark"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
 
-            <el-table-column fixed="right" label="操作" width="80">
-              <template slot-scope="scope">
-                <el-tooltip
-                  effect="dark"
-                  content="编辑"
-                  v-if="!scope.row.edit"
-                  placement="top"
-                >
-                  <i
-                    class="el-icon-edit tb-icon"
-                    @click="editRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
-
-                <el-tooltip
-                  effect="dark"
-                  content="保存"
-                  v-if="scope.row.edit"
-                  placement="top"
-                >
-                  <i
-                    class="el-icon-circle-check tb-icon"
-                    @click="checkRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="50"
+            v-if="status === '2' && powers.some((item) => item == '042')"
+          >
+            <template slot-scope="scope">
+              <el-tooltip
+                effect="dark"
+                content="编辑"
+                v-if="!scope.row.edit"
+                placement="top"
+              >
+                <i
+                  class="el-icon-edit tb-icon"
+                  @click="editRow(scope.$index)"
+                ></i>
+              </el-tooltip>
 
-                <el-tooltip effect="dark" content="重置" placement="top">
-                  <i
-                    v-if="scope.row.edit"
-                    class="el-icon-refresh-left tb-icon"
-                    @click="resetRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table>
-          <!-- <el-col :span="24">
-            <exam-form
-              :statusList="statusList"
-              :newTime="newTime"
-              :disabled="false"
-              :isMust="false"
-              @searchChange="examForm"
-            />
-          </el-col> -->
+              <el-tooltip
+                effect="dark"
+                content="保存"
+                v-if="scope.row.edit"
+                placement="top"
+              >
+                <i
+                  class="el-icon-circle-check tb-icon"
+                  @click="checkRow(scope.$index)"
+                ></i>
+              </el-tooltip>
 
-          <el-col :span="24" style="text-align: right; padding: 30px 0 10px 0">
-            <el-button
-              v-if="status == '2'"
-              type="primary"
-              :size="'mini'"
-              @click="submitForm"
-              >保 存
-            </el-button>
-          </el-col>
-        </el-form-item>
+              <el-tooltip effect="dark" content="重置" placement="top">
+                <i
+                  v-if="scope.row.edit"
+                  class="el-icon-refresh-left tb-icon"
+                  @click="resetRow(scope.$index)"
+                ></i>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-col
+          :span="24"
+          style="text-align: right; padding: 30px 0 10px 0"
+          v-if="status === '2' && powers.some((item) => item == '042')"
+        >
+          <el-button type="primary" :size="'mini'" @click="submitForm"
+            >保 存
+          </el-button>
+        </el-col>
       </el-form>
     </el-col>
   </el-row>
@@ -154,7 +117,7 @@ import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import resToken from "@/mixins/resToken";
 import config from "./columns"; //表格列参数
 export default {
-  name: "return-check",
+  name: "zxAfterSaleOrderDetail",
   props: ["id", "newTime", "sitem"],
 
   mixins: [resToken],
@@ -162,7 +125,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "return-check"
+          (item) => item.menu_route == "zxAfterSaleOrderDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -175,10 +138,10 @@ export default {
     return {
       thNo: "",
       options: [
-        {
-          value: "0",
-          label: "待审核",
-        },
+        // {
+        //   value: "0",
+        //   label: "待审核",
+        // },
         {
           value: "1",
           label: "同意",
@@ -292,10 +255,19 @@ export default {
     //保存某一行
     checkRow(rowIndex) {
       const { check_value, check_remark } = this.tableForm.product_go[rowIndex];
-      if (check_value != "" && check_remark != "") {
+      if (check_value) {
+        this.$message.warning("审核情况不能为空!");
+        return;
+      }
+      if (check_value === "2" && check_remark === "") {
+        this.$message.warning("审核备注不能为空!");
+        return;
+      }
+      if (check_value === "1") {
+        this.tableForm.product_go[rowIndex].edit = false;
+      }
+      if (check_value === "2" && check_remark !== "") {
         this.tableForm.product_go[rowIndex].edit = false;
-      } else {
-        this.$message.warning("审核情况或审核备注不能为空");
       }
     },
     //编辑某一行

src/views/sheetOrder/zxAfterSaleOrder/detail.vue

@@ -12,9 +12,9 @@
         :status="status"
       />
       <el-collapse v-model="activeNames">
-        <el-collapse-item title="售后退后单详情" name="-1">
+        <!-- <el-collapse-item title="售后退后单详情" name="-1">
           <add-edit v-if="newTime !== ''" :newTime="newTime" :sitem="sitem" />
-        </el-collapse-item>
+        </el-collapse-item> -->
         <el-collapse-item title="退货验收记录" name="0">
           <return-record
             v-if="newTime !== ''"
@@ -32,7 +32,11 @@
             @refresh="initData"
           />
         </el-collapse-item>
-        <el-collapse-item title="业务审核" name="2">
+        <el-collapse-item
+          title="业务审核"
+          name="2"
+          v-if="powers.some((item) => item == '042')"
+        >
           <exam-form
             v-if="newTime !== ''"
             :statusList="statusList"
@@ -100,8 +104,8 @@ export default {
       status: "", //存储详情接口状态
       statusList: [
         {
-          value: "1",
-          label: "退货验收",
+          value: "0",
+          label: "退货验收记录",
         },
         {
           value: "2",

src/views/sheetOrder/zxOrder/components/addForm.vue

@@ -251,7 +251,7 @@
       </el-col>
       <el-col
         :span="24"
-        style="text-align: right"
+        style="text-align: right;padding:0 0 20px 0"
         v-if="status === '0' && powers.some((item) => item == '005')"
       >
         <el-button :size="'mini'" type="primary" @click="submitForm"

src/views/sheetOrder/zxOrder/components/order-out-table.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="outOrderTable">
     <el-table
-      ref="addrForm"
       :data="tableData"
       border
       :size="'mini'"
@@ -92,7 +91,7 @@
           <el-tooltip
             style="margin: 3px 0 0 5px"
             effect="dark"
-            v-if="!isAll && powers.some((item) => item == '005')"
+            v-if="!isAll && powers.some((item) => item == '048')"
             content="添加"
             placement="top"
           >
@@ -101,8 +100,6 @@
               style="color: #63cbe7"
               @click="openHouseModal()"
             ></i>
-
-         
           </el-tooltip>
           <span v-else>操作</span>
         </template>
@@ -141,7 +138,6 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/sheetOrder/zxOrder/detail";
 import outOrderAddModel from "./out-order-add-model";
 import addEdit from "@/views/sellOut/sellAfterApply/components/addEdit";
 import { mapGetters } from "vuex";
@@ -203,7 +199,6 @@ export default {
     async initForm() {
       this.status = "";
       this.queryId = this.$route.query.id;
-      // this.rulesThis = this.rules;
       this.resetForm();
     },
     getNewTime() {
@@ -212,23 +207,22 @@ export default {
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
-     
-        const { bum, status, good_num } = this.sitem;
-        if (status !== "4") {
+        const { orderout, status, good_num } = this.sitem;
+        if (status === "1" || status === "2") {
           let total = 0;
-          bum.forEach((v) => {
+          orderout.forEach((v) => {
             total += parseInt(v.send_num);
           });
-          if (total == parseInt(good_num)) {
-            this.isAll = false;
+          console.log(total);
+          if (total === parseInt(good_num)) {
+             this.isAll = true;
           } else {
-            this.isAll = true;
+             this.isAll = false;
           }
         } else {
-          this.isAll = true;
+           this.isAll = false;
         }
-
-        this.tableData = bum;
+        this.tableData = JSON.parse(JSON.stringify(orderout)) ;
       });
     },
     openHouseModal() {
@@ -237,43 +231,6 @@ export default {
       this.modelShowModel = true;
     },
 
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
-          let model = {
-            id: this.queryId,
-            order_addr: [],
-          };
-          order_addr.forEach((v2) => {
-            let model2 = {
-              post_fee: v2.post_fee,
-              id: v2.id,
-            };
-            model.order_addr.push(model2);
-          });
-          let res = await asyncRequest.salefee(model);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "反馈物流费用成功！",
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
     openModal(code, btn_code) {
       this.s_sitem = btn_code;
       this.btn_code = btn_code;

src/views/sheetOrder/zxOrder/components/out-order-add-model.vue

@@ -56,6 +56,7 @@
           </el-table>
         </el-col>
         <el-form
+        style="padding:15px 0 0 0"
           ref="ruleForm"
           :model="ruleForm"
           status-icon
@@ -235,9 +236,9 @@ export default {
           this.tableData1 = addrs;
           this.ruleForm = {
             post_name: [],
-            post_code: "xxx2322",
-            post_fee: "20",
-            send_num: "10",
+            post_code: "",
+            post_fee: "",
+            send_num: "",
             addrid: "",
             orderCode: orderCode || "",
             wsm_code: "",

src/views/sheetOrder/zxOrder/detail.vue

@@ -6,9 +6,26 @@
     >
       {{ status }}--{{ powers }}
       <div class="tl" style="padding: 10px 0 50px 0">
-        <!-- <span> {{ status }}----{{ powers }}</span> -->
-
+        <span>咨询订单编号：</span>
+        <span v-if="sitem">{{ sitem.orderCode }}</span>
+        <el-button
+          @click="statusConfirm('-1', '作废该条信息')"
+          type="danger"
+          plain
+          class="fr"
+          :size="'mini'"
+          style="margin: 0 0 0 10px"
+          v-if="
+            (status == '0' || status == '1') &&
+            powers.some((item) => item == '007')
+          "
+          >作废该条信息</el-button
+        >
         <el-button
+          v-if="
+            (status == '3' || status == '4' || status == '5') &&
+            powers.some((item) => item == '051')
+          "
           style="margin: 0 0 0 10px"
           class="fr"
           type="primary"
@@ -28,18 +45,6 @@
           v-if="status === '2' && powers.some((item) => item == '026')"
           >开始发货
         </el-button> -->
-        <!-- <el-button
-          @click="statusConfirm('-1', '作废该条信息')"
-          type="danger"
-          plain
-          :size="'mini'"
-          v-if="
-            status !== '' &&
-            status !== '3' &&
-            powers.some((item) => item == '015')
-          "
-          >作废该条信息</el-button
-        > -->
       </div>
       <status-bar
         v-if="newTime !== ''"

src/views/sheetOrder/zxReturn/components/purchase-exam.vue

@@ -5,7 +5,7 @@
     :model="ruleForm"
     status-icon
     :rules="rulesThis"
-    label-width="100px"
+    label-width="110px"
     style="width: 100%"
     class="demo-ruleForm"
   >
@@ -13,43 +13,48 @@
       <el-col :span="24" style="margin: -10px 0 10px 0">
         <el-divider>虚拟仓商品入库信息设置</el-divider>
       </el-col>
-
       <el-col :span="12">
-        <el-form-item label="仓库所在公司" prop="canSellGoods_numbers">
-          <el-input
-            :disabled="disabled"
-            v-model="ruleForm.getGoods_numbers"
-            placeholder="仓库所在公司"
-          ></el-input>
+        <el-form-item label="仓库所在公司" prop="return_company">
+          <search-supplier
+            :placeholder="'仓库所在公司'"
+            :type="'1'"
+            :value="ruleForm.return_company"
+            @searchChange="selectSupplier"
+          />
         </el-form-item>
       </el-col>
-      <!-- 其他备注 otherRemark-->
       <el-col :span="12">
-        <el-form-item label="入库仓库" prop="otherRemark">
-          <el-input
-            placeholder="入库仓库"
-            v-model="ruleForm.otherRemark"
-            :disabled="disabled"
+        <el-form-item label="入库仓库" prop="return_wsm">
+          <search-stock
+            :isDetail="true"
+            :value="ruleForm.return_wsm"
+            :disabled="supplier_code === ''"
+            :placeholder="'出库仓库'"
+            :isRelation="true"
+            :companyCode="supplier_code"
+            :names="''"
+            @searchChange="selectStock"
           />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="入库数量" prop="getGoods_numbers">
+        <el-form-item label="退货总数量" prop="cgd_wsend" required>
           <el-input
-            :disabled="disabled"
-            v-model="ruleForm.getGoods_numbers"
-            placeholder="入库数量"
+            disabled
+            v-model="ruleForm.cgd_wsend"
+            placeholder="退货总数量"
           ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12" style="text-align: right">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
+        <el-button type="primary" :size="'mini'" @click="submitForm"
+          >保 存</el-button
+        >
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
-import { isnumber } from "@/utils/validate.js";
 import asyncRequest from "@/apis/service/sheetOrder/zxReturn";
 import resToken from "@/mixins/resToken";
 export default {
@@ -57,18 +62,9 @@ export default {
   props: ["id", "sitem", "showModel", "newTime"],
   mixins: [resToken],
   data() {
-    const validatenumbers = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("异常数量不能为空！"));
-      } else {
-        if (!isnumber(value)) {
-          callback(new Error("异常数量必须为数字"));
-        } else {
-          callback();
-        }
-      }
-    };
     return {
+      supplier_code: "",
+      return_wsm: "",
       isShow: true,
       loading: false,
       disabled: true,
@@ -89,67 +85,30 @@ export default {
       rulesThis: this.rules,
       // 验证规则
       rules: {
-        anomalous_numbers: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatenumbers,
-          },
-        ],
-        anomalous_reason: [
-          {
-            required: true,
-            message: "请选择异常原因",
-            trigger: "change",
-          },
-        ],
-        expect_wish: [
+        return_wsm: [
           {
+            type: "array",
             required: true,
-            message: "请选择期望意愿",
+            message: "请选择入库仓库",
             trigger: "change",
           },
         ],
-        anomalous_images: [
+        return_company: [
           {
             type: "array",
             required: true,
-            message: "异常图片不能为空！",
+            message: "请选择仓库所在公司",
             trigger: "change",
           },
         ],
-        anomalous_remark: [
-          {
-            required: true,
-            message: "请输入异常原因备注",
-            trigger: "blur",
-          },
-        ],
       },
-      reason_options: [],
-      reason_value: "", //异常原因
-      expect_options: [
-        {
-          value: "1",
-          label: "退货",
-        },
-        {
-          value: "2",
-          label: "换货",
-        },
-        {
-          value: "3",
-          label: "接受差异改变售价",
-        },
-      ],
-      expect_value: "", //期望意愿
     };
   },
   computed: {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "handoverDetail"
+          (item) => item.menu_route == "zxReturnDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -175,14 +134,6 @@ export default {
     },
   },
   methods: {
-    //   关闭弹窗,直接隐藏表单
-    // async closeAddEdit() {
-    //   this.$emit("closeModel", false); //抛出一个事件，关闭弹窗
-    //
-    // },
-    closeAdd() {
-      this.showModelThis = false;
-    },
     async initForm() {
       this.loading = true;
       this.status = "";
@@ -190,32 +141,28 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
-    async initData() {
-      if (this.sitem) {
-        let { returnCode } = this.sitem;
-        let model = {
-          returnCode,
-        };
-        const res = await asyncRequest.detail(model);
-        if (res && res.code === 0 && res.data) {
-          let { error_num, error_img, error_remark, except_code, error_code } =
-            res.data;
-          this.ruleForm = {
-            stock_out_numbers: "", //出库单编号
-            anomalous_numbers: error_num, //异常数量
-            anomalous_reason: error_code, //异常原因
-            expect_wish: except_code, //期望意愿
-            anomalous_images: [error_img],
-            anomalous_remark: error_remark, //异常备注
-          };
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.$message.warning(res.message);
-        }
+    // 选择供应商
+    selectSupplier(e) {
+      if (e && e.id) {
+        this.ruleForm.return_company = [e.code];
+        this.supplier_code = e.code;
+      } else {
+        this.ruleForm.return_wsm = [];
+        this.ruleForm.return_company = [];
+        this.return_wsm = "";
+        this.supplier_code = "";
+      }
+    },
+    // 选择供应商仓库
+    selectStock(e) {
+      if (e && e.id) {
+        this.ruleForm.return_wsm = [e.code];
+        this.return_wsm = e.code;
+      } else {
+        this.ruleForm.return_wsm = [];
+        this.return_wsm = "";
       }
     },
-
     async resetForm() {
       this.resign_name = "";
       this.hand_name = "";
@@ -225,21 +172,17 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-
-          let { bum } = this.sitem;
-          if (this.id === "add") {
-            let OutCode = "";
-            bum.map((ele) => {
-              OutCode = ele.outCode;
-            });
-            this.ruleForm = {
-              anomalous_numbers: "", //异常数量
-              anomalous_reason: "", //异常原因
-              expect_wish: "", //期望意愿
-              anomalous_images: [],
-              outCode: OutCode,
-            };
-          }
+          let { cgd_wsend, status, return_wsm, returnCode, return_company } =
+            this.sitem;
+          console.log(this.sitem);
+          this.status = status;
+          this.ruleForm = {
+            returnCode: returnCode || "",
+            cgd_wsend: cgd_wsend || "",
+            return_wsm: return_wsm ? [return_wsm] : [],
+            return_company: return_company ? [return_company] : [],
+          };
+          console.log(this.ruleForm);
         }
       });
     },
@@ -272,13 +215,7 @@ export default {
               title,
               message: "",
             });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+            this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sheetOrder/zxReturn/components/purchase-feedback.vue

@@ -5,53 +5,61 @@
     :model="ruleForm"
     status-icon
     :rules="rulesThis"
-    label-width="110px"
+    label-width="135px"
     style="width: 100%"
     class="demo-ruleForm"
   >
     <el-row>
       <el-col :span="8">
-        <el-form-item label="采购总数" prop="getGoods_numbers">
+        <el-form-item label="采购总数" prop="cgd_total" required>
           <el-input
-            :disabled="disabled"
-            v-model="ruleForm.getGoods_numbers"
+            disabled
+            v-model="ruleForm.cgd_total"
             placeholder="采购总数"
           ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="已入库商品数" prop="getGoods_numbers">
+        <el-form-item label="已入库商品数" prop="cgd_send" required>
           <el-input
-            :disabled="disabled"
-            v-model="ruleForm.getGoods_numbers"
+            disabled
+            v-model="ruleForm.cgd_send"
             placeholder="已入库商品数"
           ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="未入库商品数" prop="getGoods_numbers">
+        <el-form-item label="未入库商品数" prop="cgd_wsend" required>
           <el-input
-            :disabled="disabled"
-            v-model="ruleForm.getGoods_numbers"
+            disabled
+            v-model="ruleForm.cgd_wsend"
             placeholder="未入库商品数"
           ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="未入库部分" prop="canSellGoods_numbers">
-          <el-input
-            :disabled="disabled"
-            v-model="ruleForm.getGoods_numbers"
-            placeholder="未入库部分是否可退"
-          ></el-input>
+        <el-form-item label="未入库数量可退否" prop="wsend_th">
+          <el-select
+            v-model="ruleForm.wsend_th"
+            style="width: 100%"
+            placeholder="未入库数量可退否"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="16">
-        <el-form-item label="其他备注" prop="otherRemark">
+        <el-form-item label="备注" prop="remark">
           <el-input
             type="textarea"
-            placeholder="请输入其他原因备注"
-            v-model="ruleForm.otherRemark"
+            placeholder="备注"
+            v-model="ruleForm.remark"
             :disabled="disabled"
             maxlength="250"
             show-word-limit
@@ -76,86 +84,55 @@ export default {
   mixins: [resToken],
   data() {
     return {
-      isShow: true,
+      options: [
+        {
+          value: "1",
+          label: "是",
+        },
+        {
+          value: "0",
+          label: "否",
+        },
+      ],
       loading: false,
-      disabled: true,
-      status: "", //存储详情接口返的状态
+
+      status: "",
       showModelThis: this.showModel,
-      resign_name: "", //离职人
-      hand_name: "", //交接人
+
       ruleForm: {
-        order_type: "1", //售后类型 1销售2咨询，
-        outCode: "", //
-        stock_out_numbers: "", //出库单编号
-        anomalous_numbers: "", //异常数量
-        anomalous_reason: "", //异常原因
-        expect_wish: "", //期望意愿
-        anomalous_images: [],
-        anomalous_remark: "", //异常备注
+        returnCode: "",
+        cgd_total: "",
+        cgd_wsend: "",
+        cgd_send: "",
+        wsend_th: "1",
+        remark: "",
       },
       rulesThis: this.rules,
       // 验证规则
       rules: {
-        anomalous_numbers: [
-          {
-            required: true,
-            trigger: "blur",
-          },
-        ],
-        anomalous_reason: [
-          {
-            required: true,
-            message: "请选择异常原因",
-            trigger: "change",
-          },
-        ],
-        expect_wish: [
+        wsend_th: [
           {
             required: true,
-            message: "请选择期望意愿",
+            message: "请选择未入库数量可退否",
             trigger: "change",
           },
         ],
-        anomalous_images: [
-          {
-            type: "array",
-            required: true,
-            message: "异常图片不能为空！",
-            trigger: "change",
-          },
-        ],
-        anomalous_remark: [
+
+        remark: [
           {
             required: true,
-            message: "请输入异常原因备注",
+            message: "请输入备注",
             trigger: "blur",
           },
         ],
       },
-      reason_options: [],
-      reason_value: "", //异常原因
-      expect_options: [
-        {
-          value: "1",
-          label: "退货",
-        },
-        {
-          value: "2",
-          label: "换货",
-        },
-        {
-          value: "3",
-          label: "接受差异改变售价",
-        },
-      ],
-      expect_value: "", //期望意愿
     };
   },
   computed: {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "handoverDetail"
+          (item) => item.menu_route == "zxReturnDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -180,14 +157,6 @@ export default {
     },
   },
   methods: {
-    //   关闭弹窗,直接隐藏表单
-    // async closeAddEdit() {
-    //   this.$emit("closeModel", false); //抛出一个事件，关闭弹窗
-    //
-    // },
-    closeAdd() {
-      this.showModelThis = false;
-    },
     async initForm() {
       this.loading = true;
       this.status = "";
@@ -195,69 +164,50 @@ export default {
       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();
-          let { bum } = this.sitem;
-          if (this.id === "add") {
-            let OutCode = "";
-            bum.map((ele) => {
-              OutCode = ele.outCode;
-            });
-            this.ruleForm = {
-              anomalous_numbers: "", //异常数量
-              anomalous_reason: "", //异常原因
-              expect_wish: "", //期望意愿
-              anomalous_images: [],
-              outCode: OutCode,
-            };
-          }
+          let {
+            cgd_wsend,
+            cgd_send,
+            status,
+            cgd_total,
+            wsend_th,
+            remark,
+            returnCode,
+          } = this.sitem;
+          this.status = status;
+          this.ruleForm = {
+            returnCode: returnCode || "",
+            cgd_total: cgd_total || "",
+            cgd_wsend: cgd_wsend || "",
+            cgd_send: cgd_send || "",
+            wsend_th: wsend_th || "1",
+            remark: remark || "",
+          };
         }
       });
     },
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
-          const { anomalous_numbers } = this.ruleForm;
-          if (this.sitem.send_num < anomalous_numbers) {
-            this.$message.warning("异常数量不能大于发货数量");
-            return false;
-          }
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-
-          // console.log("调接口");
-          let _model = {
-            order_type: "1",
-            outCode: model.outCode,
-            errorCode: model.anomalous_reason, //异常原因
-            num: model.anomalous_numbers,
-            remark: model.anomalous_remark,
-            except_code: model.expect_wish,
-            img: model.anomalous_images.toString(),
-          };
-
-          const res = await asyncRequest.add(_model);
+          model.status = model.wsend_th === "1" ? "3" : "4";
+          delete model["cgd_total"];
+          delete model[" cgd_wsend"];
+          delete model[" cgd_send"];
+          const res = await asyncRequest.status(model);
 
           if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功！" : "修改成功！";
             this.$notify.success({
-              title,
+              title: "提交成功",
               message: "",
             });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+            this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sheetOrder/zxReturn/components/returnCheck copy.vue

@@ -1,618 +0,0 @@
-<template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    label-width="100px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="异常数量" prop="anomalous_numbers">
-            <el-input
-              :disabled="disabled"
-              v-model="ruleForm.anomalous_numbers"
-              placeholder="请输入异常数量"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="异常原因" prop="anomalous_reason">
-            <el-select
-              style="width: 100%"
-              :disabled="disabled"
-              v-model="ruleForm.anomalous_reason"
-              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>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="期望意愿" prop="expect_wish">
-            <el-select
-              style="width: 100%"
-              :disabled="disabled"
-              v-model="ruleForm.expect_wish"
-              placeholder="请选择期望意愿"
-            >
-              <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="12">
-          <el-form-item label="异常备注" prop="anomalous_remark">
-            <el-input
-              type="textarea"
-              placeholder="请输入异常原因备注"
-              v-model="ruleForm.anomalous_remark"
-              :disabled="disabled"
-              maxlength="250"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-col :span="24">
-        <el-form-item label="异常图片" prop="anomalous_images">
-          <div class="el-form-item-error-img">
-            <ul>
-              <li
-                class="images_li"
-                :style="getMargin_li()"
-                v-for="(item, index) in ruleForm.anomalous_images"
-                :key="item"
-              >
-                <img :src="item" alt="" style="width: 254px; height: 164px" />
-                <i class="el-icon-close" @click="imgClose(index)"></i>
-              </li>
-            </ul>
-            <div
-              class="btnupload"
-              :style="getMargin()"
-              v-if="ruleForm.anomalous_images.length < 5 && isShow"
-              style="position: relative"
-              @click="open"
-            >
-              <i class="el-icon-plus avatar-uploader-icon"></i>
-              <file-upload
-                class="Upload"
-                :accept="'.jpg,.png,.bmp,.jpeg'"
-                :multiple="true"
-                :uploadcondition="beforeAvatarUpload"
-                @UploadErrorEvent="UploadErrorEvent"
-                @UploadSuccessEvent="UploadSuccessEvent"
-              />
-            </div>
-          </div>
-        </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
-        >
-        <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 { isnumber } from "@/utils/validate.js";
-import asyncRequest from "@/apis/service/sheetOrder/zxReturn";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "handover",
-  props: ["id", "sitem", "showModelThis", "newTime"],
-  mixins: [resToken],
-  data() {
-    const validatenumbers = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("异常数量不能为空！"));
-      } else {
-        if (!isnumber(value)) {
-          callback(new Error("异常数量必须为数字"));
-        } else {
-          callback();
-        }
-      }
-    };
-    return {
-      isShow: true,
-      loading: false,
-      disabled: true,
-      status: "", //存储详情接口返的状态
-      showModelThis: this.showModel,
-      resign_name: "", //离职人
-      hand_name: "", //交接人
-      ruleForm: {
-        order_type: "1", //售后类型 1销售2咨询，
-        outCode: "", //
-        stock_out_numbers: "", //出库单编号
-        anomalous_numbers: "", //异常数量
-        anomalous_reason: "", //异常原因
-        expect_wish: "", //期望意愿
-        anomalous_images: [],
-        anomalous_remark: "", //异常备注
-      },
-      rulesThis: this.rules,
-      // 验证规则
-      rules: {
-        anomalous_numbers: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatenumbers,
-          },
-        ],
-        anomalous_reason: [
-          {
-            required: true,
-            message: "请选择异常原因",
-            trigger: "change",
-          },
-        ],
-        expect_wish: [
-          {
-            required: true,
-            message: "请选择期望意愿",
-            trigger: "change",
-          },
-        ],
-        anomalous_images: [
-          {
-            type: "array",
-            required: true,
-            message: "异常图片不能为空！",
-            trigger: "change",
-          },
-        ],
-        anomalous_remark: [
-          {
-            required: true,
-            message: "请输入异常原因备注",
-            trigger: "blur",
-          },
-        ],
-      },
-      reason_options: [],
-      reason_value: "", //异常原因
-      expect_options: [
-        {
-          value: "1",
-          label: "退货",
-        },
-        {
-          value: "2",
-          label: "换货",
-        },
-        {
-          value: "3",
-          label: "接受差异改变售价",
-        },
-      ],
-      expect_value: "", //期望意愿
-    };
-  },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "handoverDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  mounted() {
-    this.getReason(); //获取异常原因
-    this.initForm();
-  },
-  watch: {
-    id: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-    newTime: function (val) {
-      if (val) {
-        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;
-        this.disabled = false;
-        await this.resetForm();
-      } else {
-        this.isShow = false;
-        this.rulesThis = this.rules;
-        await this.resetForm();
-        await this.initData();
-      }
-      this.loading = false;
-    },
-    async initData() {
-      if (this.sitem) {
-        let { returnCode } = this.sitem;
-        let model = {
-          returnCode,
-        };
-        const res = await asyncRequest.detail(model);
-        if (res && res.code === 0 && res.data) {
-          let { error_num, error_img, error_remark, except_code, error_code } =
-            res.data;
-          this.ruleForm = {
-            stock_out_numbers: "", //出库单编号
-            anomalous_numbers: error_num, //异常数量
-            anomalous_reason: error_code, //异常原因
-            expect_wish: except_code, //期望意愿
-            anomalous_images: [error_img],
-            anomalous_remark: error_remark, //异常备注
-          };
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.$message.warning(res.message);
-        }
-      }
-    },
-
-    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();
-
-          let { bum } = this.sitem;
-          if (this.id === "add") {
-            let OutCode = "";
-            bum.map((ele) => {
-              OutCode = ele.outCode;
-            });
-            this.ruleForm = {
-              anomalous_numbers: "", //异常数量
-              anomalous_reason: "", //异常原因
-              expect_wish: "", //期望意愿
-              anomalous_images: [],
-              outCode: OutCode,
-            };
-          }
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          const { anomalous_numbers } = this.ruleForm;
-          if (this.sitem.send_num < anomalous_numbers) {
-            this.$message.warning("异常数量不能大于发货数量");
-            return false;
-          }
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-
-          // console.log("调接口");
-          let _model = {
-            order_type: "1",
-            outCode: model.outCode,
-            errorCode: model.anomalous_reason, //异常原因
-            num: model.anomalous_numbers,
-            remark: model.anomalous_remark,
-            except_code: model.expect_wish,
-            img: model.anomalous_images.toString(),
-          };
-
-          const res = await asyncRequest.add(_model);
-
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功！" : "修改成功！";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
-          } 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;
-        }
-      });
-    },
-    async statusConfirm(status, message) {
-      await this.$confirm(`确定要${message}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          if (status === "-1") {
-            await this.deleteById(message);
-          } else {
-            await this.setStatus(status, message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-
-    async deleteById(message) {
-      const res = await asyncRequest.delete({ id: this.id });
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-
-        this.routeGoto("handover", {});
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-
-    async setStatus(status, message) {
-      let model = {
-        id: this.id,
-        remark: "",
-        status: status,
-      };
-      const res = await asyncRequest.status(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-        this.initForm();
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-
-    open() {
-      this.show = true;
-    },
-    // 获取异常原因
-    async getReason() {
-      let model = {
-        type: "2",
-        page: 1,
-        size: 100,
-      };
-      const res = await asyncRequest.reasonList(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        this.reason_options = res.data.list;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-    // 异常原因
-    handleAnomalousReason(e) {
-      if (e) {
-        this.ruleForm.anomalous_reason = e;
-      } else {
-        this.ruleForm.anomalous_reason = "";
-      }
-      this.$refs.ruleForm.validateField("company_img");
-    },
-    //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("anomalous_images");
-    },
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
-        this.ruleForm.anomalous_images.push(url);
-        this.$message.success("图片上传成功!");
-        this.$refs.ruleForm.validateField("anomalous_images");
-      }
-    },
-    //判断图片规格
-    beforeAvatarUpload(file) {
-      let isJPG = false,
-        isLt2M = false;
-      if (file) {
-        if (
-          file.type === "image/jpg" ||
-          file.type === "image/png" ||
-          file.type === "image/bmp" ||
-          file.type === "image/jpeg"
-        ) {
-          isJPG = true;
-        }
-        isLt2M = file.size / 1024 / 1024 < 1;
-        if (!isJPG) {
-          this.$message.error("图片格式不正确！");
-        }
-        if (!isLt2M) {
-          this.$message.error("图片大小不能超过 1MB!");
-        }
-      }
-
-      return isJPG && isLt2M;
-    },
-    imgClose(index) {
-      this.ruleForm.anomalous_images.splice(index, 1);
-      this.$refs.ruleForm.validateField("anomalous_images");
-    },
-    getMargin() {
-      if (this.ruleForm.anomalous_images.length == 0) {
-        return "margin:0;";
-      } else if (this.ruleForm.anomalous_images.length < 3) {
-        return "margin:0px 0 0 10px";
-      } else {
-        return "margin:10px 0 0 10px";
-      }
-    },
-    getMargin_li() {
-      if (this.ruleForm.anomalous_images.length <= 3) {
-        return "margin:0 0 0 10px";
-      } else {
-        return "margin:10px 0 0 10px";
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.el-form-item-error-img {
-  width: 100%;
-  ul {
-    width: 100%;
-    li {
-      float: left;
-      border: 1px solid rgb(220, 223, 230);
-      // border-left: 0;
-      box-sizing: border-box;
-      width: 254px;
-      height: 164px;
-      line-height: 164px;
-      position: relative;
-      img {
-        display: inline-block;
-        width: 100%;
-        height: 100%;
-      }
-      .el-icon-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        z-index: 2;
-        width: 25px;
-        height: 25px;
-        text-align: center;
-        line-height: 25px;
-        font-size: 19px;
-        &:hover {
-          color: #63cbe7;
-        }
-      }
-    }
-  }
-}
-.images_li {
-  // width: 254px;
-  // height: 164px;
-  float: left;
-}
-.btnupload {
-  float: left;
-  border: 1px solid rgb(220, 223, 230);
-  // border-left: 0;
-  box-sizing: border-box;
-  width: 254px;
-  height: 164px;
-  line-height: 164px;
-  text-align: center;
-}
-.Upload {
-  width: 254px;
-  height: 164px;
-  line-height: 164px;
-  text-align: center;
-  position: absolute;
-  line-height: 0px;
-  top: 0;
-  left: 0;
-  z-index: 2;
-  line-height: 164px;
-}
-.avatar-uploader-icon {
-  font-size: 33px;
-  color: #8c939d;
-  width: 50px;
-  height: 50px;
-  line-height: 50px;
-  text-align: center;
-}
-</style>

src/views/sheetOrder/zxReturn/components/returnCheck.vue

@@ -1,535 +0,0 @@
-<template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    label-width="100px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="订单商品总数" prop="getGoods_numbers">
-            <el-input
-              :disabled="disabled"
-              v-model="ruleForm.getGoods_numbers"
-              placeholder="订单商品总数"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="已发货商品总数" prop="canSellGoods_numbers">
-            <el-input
-              :disabled="disabled"
-              v-model="ruleForm.getGoods_numbers"
-              placeholder="请输入可销售数量"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <!-- 其他备注 otherRemark-->
-        <el-col :span="12" offset="12">
-          <el-form-item label="其他备注" prop="otherRemark">
-            <el-input
-              type="textarea"
-              placeholder="请输入其他原因备注"
-              v-model="ruleForm.otherRemark"
-              :disabled="disabled"
-              maxlength="250"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <!-- 异常情况记录  anomalousRecard-->
-        <el-col :span="12" offset="12">
-          <el-form-item label="异常情况记录" prop="anomalousRecard">
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <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
-        >
-   
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import { isnumber } from "@/utils/validate.js";
-import asyncRequest from "@/apis/service/sheetOrder/zxReturn";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "handover",
-  props: ["id", "sitem", "showModel", "newTime"],
-  mixins: [resToken],
-  data() {
-    const validatenumbers = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("异常数量不能为空！"));
-      } else {
-        if (!isnumber(value)) {
-          callback(new Error("异常数量必须为数字"));
-        } else {
-          callback();
-        }
-      }
-    };
-    return {
-      isShow: true,
-      loading: false,
-      disabled: true,
-      status: "", //存储详情接口返的状态
-      showModelThis: this.showModel,
-      resign_name: "", //离职人
-      hand_name: "", //交接人
-      ruleForm: {
-        order_type: "1", //售后类型 1销售2咨询，
-        outCode: "", //
-        stock_out_numbers: "", //出库单编号
-        anomalous_numbers: "", //异常数量
-        anomalous_reason: "", //异常原因
-        expect_wish: "", //期望意愿
-        anomalous_images: [],
-        anomalous_remark: "", //异常备注
-      },
-      rulesThis: this.rules,
-      // 验证规则
-      rules: {
-        anomalous_numbers: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatenumbers,
-          },
-        ],
-        anomalous_reason: [
-          {
-            required: true,
-            message: "请选择异常原因",
-            trigger: "change",
-          },
-        ],
-        expect_wish: [
-          {
-            required: true,
-            message: "请选择期望意愿",
-            trigger: "change",
-          },
-        ],
-        anomalous_images: [
-          {
-            type: "array",
-            required: true,
-            message: "异常图片不能为空！",
-            trigger: "change",
-          },
-        ],
-        anomalous_remark: [
-          {
-            required: true,
-            message: "请输入异常原因备注",
-            trigger: "blur",
-          },
-        ],
-      },
-      reason_options: [],
-      reason_value: "", //异常原因
-      expect_options: [
-        {
-          value: "1",
-          label: "退货",
-        },
-        {
-          value: "2",
-          label: "换货",
-        },
-        {
-          value: "3",
-          label: "接受差异改变售价",
-        },
-      ],
-      expect_value: "", //期望意愿
-    };
-  },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "handoverDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  mounted() {
-    this.getReason(); //获取异常原因
-    this.initForm();
-  },
-  watch: {
-    id: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-    newTime: function (val) {
-      if (val) {
-        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;
-        this.disabled = false;
-        await this.resetForm();
-      } else {
-        this.isShow = false;
-        this.rulesThis = this.rules;
-        await this.resetForm();
-        await this.initData();
-      }
-      this.loading = false;
-    },
-    async initData() {
-      if (this.sitem) {
-        let { returnCode } = this.sitem;
-        let model = {
-          returnCode,
-        };
-        const res = await asyncRequest.detail(model);
-        if (res && res.code === 0 && res.data) {
-          let { error_num, error_img, error_remark, except_code, error_code } =
-            res.data;
-          this.ruleForm = {
-            stock_out_numbers: "", //出库单编号
-            anomalous_numbers: error_num, //异常数量
-            anomalous_reason: error_code, //异常原因
-            expect_wish: except_code, //期望意愿
-            anomalous_images: [error_img],
-            anomalous_remark: error_remark, //异常备注
-          };
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.$message.warning(res.message);
-        }
-      }
-    },
-
-    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();
-          
-          let { bum } = this.sitem;
-          if (this.id === "add") {
-            let OutCode = "";
-            bum.map((ele) => {
-              OutCode = ele.outCode;
-            });
-            this.ruleForm = {
-              anomalous_numbers: "", //异常数量
-              anomalous_reason: "", //异常原因
-              expect_wish: "", //期望意愿
-              anomalous_images: [],
-              outCode: OutCode,
-            };
-          }
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          const { anomalous_numbers } = this.ruleForm;
-          if (this.sitem.send_num < anomalous_numbers) {
-            this.$message.warning("异常数量不能大于发货数量");
-            return false;
-          }
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-
-          // console.log("调接口");
-          let _model = {
-            order_type: "1",
-            outCode: model.outCode,
-            errorCode: model.anomalous_reason, //异常原因
-            num: model.anomalous_numbers,
-            remark: model.anomalous_remark,
-            except_code: model.expect_wish,
-            img: model.anomalous_images.toString(),
-          };
-
-          const res = await asyncRequest.add(_model);
-
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功！" : "修改成功！";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
-          } 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;
-        }
-      });
-    },
-    async statusConfirm(status, message) {
-      await this.$confirm(`确定要${message}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          if (status === "-1") {
-            await this.deleteById(message);
-          } else {
-            await this.setStatus(status, message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-
-    async deleteById(message) {
-      const res = await asyncRequest.delete({ id: this.id });
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-
-        this.routeGoto("handover", {});
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-
-    async setStatus(status, message) {
-      let model = {
-        id: this.id,
-        remark: "",
-        status: status,
-      };
-      const res = await asyncRequest.status(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-        this.initForm();
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-
-    open() {
-      this.show = true;
-    },
-    // 获取异常原因
-    async getReason() {
-      let model = {
-        type: "2",
-        page: 1,
-        size: 100,
-      };
-      const res = await asyncRequest.reasonList(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        this.reason_options = res.data.list;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-    // 异常原因
-    handleAnomalousReason(e) {
-      if (e) {
-        this.ruleForm.anomalous_reason = e;
-      } else {
-        this.ruleForm.anomalous_reason = "";
-      }
-      this.$refs.ruleForm.validateField("company_img");
-    },
-    //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("anomalous_images");
-    },
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
-        this.ruleForm.anomalous_images.push(url);
-        this.$message.success("图片上传成功!");
-        this.$refs.ruleForm.validateField("anomalous_images");
-      }
-    },
-    //判断图片规格
-    beforeAvatarUpload(file) {
-      let isJPG = false,
-        isLt2M = false;
-      if (file) {
-        if (
-          file.type === "image/jpg" ||
-          file.type === "image/png" ||
-          file.type === "image/bmp" ||
-          file.type === "image/jpeg"
-        ) {
-          isJPG = true;
-        }
-        isLt2M = file.size / 1024 / 1024 < 1;
-        if (!isJPG) {
-          this.$message.error("图片格式不正确！");
-        }
-        if (!isLt2M) {
-          this.$message.error("图片大小不能超过 1MB!");
-        }
-      }
-
-      return isJPG && isLt2M;
-    },
-    imgClose(index) {
-      this.ruleForm.anomalous_images.splice(index, 1);
-      this.$refs.ruleForm.validateField("anomalous_images");
-    },
-    getMargin() {
-      if (this.ruleForm.anomalous_images.length == 0) {
-        return "margin:0;";
-      } else if (this.ruleForm.anomalous_images.length < 3) {
-        return "margin:0px 0 0 10px";
-      } else {
-        return "margin:10px 0 0 10px";
-      }
-    },
-    getMargin_li() {
-      if (this.ruleForm.anomalous_images.length <= 3) {
-        return "margin:0 0 0 10px";
-      } else {
-        return "margin:10px 0 0 10px";
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.el-form-item-error-img {
-  width: 100%;
-  ul {
-    width: 100%;
-    li {
-      float: left;
-      border: 1px solid rgb(220, 223, 230);
-      // border-left: 0;
-      box-sizing: border-box;
-      width: 254px;
-      height: 164px;
-      line-height: 164px;
-      position: relative;
-      img {
-        display: inline-block;
-        width: 100%;
-        height: 100%;
-      }
-      .el-icon-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        z-index: 2;
-        width: 25px;
-        height: 25px;
-        text-align: center;
-        line-height: 25px;
-        font-size: 19px;
-        &:hover {
-          color: #63cbe7;
-        }
-      }
-    }
-  }
-}
-.images_li {
-  // width: 254px;
-  // height: 164px;
-  float: left;
-}
-.btnupload {
-  float: left;
-  border: 1px solid rgb(220, 223, 230);
-  // border-left: 0;
-  box-sizing: border-box;
-  width: 254px;
-  height: 164px;
-  line-height: 164px;
-  text-align: center;
-}
-.Upload {
-  width: 254px;
-  height: 164px;
-  line-height: 164px;
-  text-align: center;
-  position: absolute;
-  line-height: 0px;
-  top: 0;
-  left: 0;
-  z-index: 2;
-  line-height: 164px;
-}
-.avatar-uploader-icon {
-  font-size: 33px;
-  color: #8c939d;
-  width: 50px;
-  height: 50px;
-  line-height: 50px;
-  text-align: center;
-}
-</style>

src/views/sheetOrder/zxReturn/detail.vue

@@ -116,11 +116,7 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sheetOrder/zxReturn";
-// import addForm from "./components/addForm";
-// import feedbackForm from "./components/feedback-form";
-// import orderOutTable from "./components/order-out-table";
 import showForm from "./components/showForm";
-// import addEdit1 from "./components/addEdit1";
 import purchaseFeedback from "./components/purchase-feedback";
 import purchaseExam from "./components/purchase-exam";
 export default {

src/views/sheetOrder/zxSheet/detail.vue

@@ -97,6 +97,19 @@ export default {
     this.initData();
   },
   methods: {
+    showGoto(){
+       this.$confirm(`咨询订单已创建成功！是否跳转至咨询订单详情页？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then( () => {
+       
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     async statusConfirm(status, message) {
       await this.$confirm(`确定要${message}？`, {
         confirmButtonText: "确定",

src/views/sheetOrder/zxoutOrder/components/addEditFormA.vue

@@ -335,12 +335,7 @@ export default {
               message: "",
             });
 
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+        this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sheetOrder/zxoutOrder/components/logisticsForm.vue

@@ -13,7 +13,7 @@
         <el-form-item label="发货总数" prop="send_num" required>
           <el-input
             disabled
-            placeholder="物流单号"
+            placeholder="发货总数"
             v-model="ruleForm.send_num"
             maxlength="100"
           />
@@ -25,6 +25,9 @@
             :value="ruleForm.post_name"
             :placeholder="'物流公司'"
             :names="''"
+            :disabled="
+              !(status === '0' && powers.some((item) => item == '045'))
+            "
             :is-detail="false"
             @searchChange="handleCompany"
           />
@@ -34,6 +37,9 @@
         <el-form-item label="物流单号" prop="post_code">
           <el-input
             placeholder="物流单号"
+            :disabled="
+              !(status === '0' && powers.some((item) => item == '045'))
+            "
             v-model="ruleForm.post_code"
             maxlength="100"
           />
@@ -43,6 +49,9 @@
         <el-form-item label="物流费用" prop="post_fee">
           <el-input
             placeholder="物流费用"
+            :disabled="
+              !(status === '0' && powers.some((item) => item == '045'))
+            "
             v-model="ruleForm.post_fee"
             maxlength="100"
           >
@@ -50,11 +59,11 @@
           </el-input>
         </el-form-item>
       </el-col>
-<!-- v-if="powers.some((item) => item == '045')" -->
+
       <el-col
         :span="24"
         style="text-align: right"
-        
+        v-if="status === '0' && powers.some((item) => item == '045')"
       >
         <el-button type="primary" :size="'mini'" @click="submitForm"
           >保 存
@@ -112,6 +121,7 @@ export default {
 
     return {
       loading: true,
+      status: "",
       ruleForm: {
         outCode: "",
         send_num: "",
@@ -151,10 +161,9 @@ export default {
     this.initForm();
   },
   methods: {
-    
-
     async initForm() {
       this.loading = true;
+      this.status = "";
       // console.log(this.sitem);
       await this.resetForm();
       this.loading = false;
@@ -167,8 +176,9 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
 
-          const { outCode, send_num, post_code, post_name, post_fee } =
+          const { outCode, send_num, post_code, post_name, post_fee, status } =
             this.sitem;
+          this.status = status;
           this.ruleForm = {
             outCode: outCode || "",
             send_num: send_num || "",

src/views/sheetOrder/zxoutOrder/components/purchase_check.vue

@@ -316,12 +316,7 @@ export default {
               message: "",
             });
 
-            if (this.id === "add") {
-              this.showModelThis = false;
-              this.$emit("refresh", false);
-            } else {
-              this.initForm();
-            }
+            this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sheetOrder/zxoutOrder/detail.vue

@@ -4,9 +4,13 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <div class="tr" style="height: 50px; padding: 10px 0 0 0">
+      <p>{{ status }}---{{ powers }}</p>
+      <div class="tl" style="height: 50px; padding: 10px 0 0 0">
+        <span>咨询出库单编号：</span>
+        <span v-if="sitem">{{ sitem.outCode }}</span>
         <el-button
           class="fr"
+          v-if="status === '2' && powers.some((item) => item == '049')"
           type="primary"
           plain
           :size="'mini'"
@@ -29,7 +33,15 @@
             v-if="newTime != ''"
           ></add-edit-form>
         </el-collapse-item>
-        <el-collapse-item title="填写物流" name="2">
+        <el-collapse-item
+          title="填写物流"
+          name="2"
+          v-if="
+            (status === '0' && powers.some((item) => item == '045')) ||
+            status === '1' ||
+            status === '2'
+          "
+        >
           <logistics-form
             :sitem="sitem"
             :newTime="newTime"
@@ -37,7 +49,11 @@
             @refresh="initData()"
           />
         </el-collapse-item>
-        <el-collapse-item title="客户验收" name="3">
+        <el-collapse-item
+          title="客户验收"
+          name="3"
+          v-if="status === '1' && powers.some((item) => item == '052')"
+        >
           <div class="tr" style="padding: 0 20px 20px 0">
             <el-button
               type="primary"