戴艳蓉 3 lat temu
rodzic
commit
1b892aa853

+ 8 - 1
src/views/goodStore/active/components/baseForm.vue

@@ -296,11 +296,18 @@ import showGoodDataModal from "@/components/show-good-data-modal";
 export default {
   name: "activeAdd",
   mixins: [resToken],
-  props: ["showModel", "id", "type", "sitem"],
+  props: ["showModel", "id", "type", "sitem", "newTime"],
   components: {
     searchGoodOnlineModal,
     showGoodDataModal,
   },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {

+ 8 - 1
src/views/goodStore/active/components/finance-exam-one-form.vue

@@ -88,7 +88,7 @@ import editMinorderForm from "./edit-minorder-form";
 export default {
   name: "financeExamOneForm",
   mixins: [resToken],
-  props: ["id", "type", "sitem"],
+  props: ["id", "type", "sitem", "newTime"],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
   },
@@ -110,6 +110,13 @@ export default {
   mounted() {
     this.initForm();
   },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
   methods: {
     async initForm() {
       this.loading = true;

+ 8 - 1
src/views/goodStore/active/components/finance-exam-three-form.vue

@@ -175,7 +175,7 @@ import showGoodDataModal from "@/components/show-good-data-modal";
 export default {
   name: "financeExamOneForm",
   mixins: [resToken],
-  props: ["id", "type", "sitem"],
+  props: ["id", "type", "sitem","newTime"],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
   },
@@ -232,6 +232,13 @@ export default {
       showGoodId: "",
       multipleSelection: [],
     };
+  },
+   watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   mounted() {
     this.initForm();

+ 8 - 1
src/views/goodStore/active/components/finance-exam-two-form.vue

@@ -101,7 +101,7 @@ import showGoodDataModal from "@/components/show-good-data-modal";
 export default {
   name: "financeExamOneForm",
   mixins: [resToken],
-  props: ["id", "type", "sitem"],
+  props: ["id", "type", "sitem",'newTime'],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
   },
@@ -119,6 +119,13 @@ export default {
       sfinditem: {},
       tableData: [],
     };
+  },
+   watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   mounted() {
     this.initForm();

+ 5 - 0
src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -315,6 +315,11 @@ export default {
         this.selectLoading = false;
       }
     },
+     newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   mounted() {
     this.initForm();

+ 5 - 0
src/views/goodStore/goodsOnline/components/handle-online-form.vue

@@ -76,6 +76,11 @@ export default {
       },
     };
   },
+   newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   mounted() {
     this.initForm();
   },

+ 5 - 0
src/views/goodStore/goodsOnline/components/online-exam-form.vue

@@ -153,6 +153,11 @@ export default {
         this.selectLoading = false;
       }
     },
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   mounted() {
     this.initForm();

+ 13 - 23
src/views/sellOut/project/components/addForm.vue

@@ -170,7 +170,11 @@
                 </el-table-column>
                 <el-table-column prop="good_name" label="商品名称" />
 
-                <el-table-column fixed="right" width="110"  v-if="type === 'add'">
+                <el-table-column
+                  fixed="right"
+                  width="110"
+                  v-if="type === 'add'"
+                >
                   <template slot="header" slot-scope="scope">
                     <span>操作</span>
                     <el-tooltip
@@ -185,22 +189,14 @@
                     </el-tooltip>
                   </template>
                   <template slot-scope="scope">
-                    <el-tooltip
-                      effect="dark"
-                      content="修改"
-                      placement="top"
-                    >
+                    <el-tooltip effect="dark" content="修改" placement="top">
                       <i
                         class="el-icon-edit tb-icon"
                         @click="openCostEdit(scope.$index, scope.row)"
                       ></i>
                     </el-tooltip>
 
-                    <el-tooltip
-                      effect="dark"
-                      content="删除"
-                      placement="top"
-                    >
+                    <el-tooltip effect="dark" content="删除" placement="top">
                       <i
                         class="el-icon-delete tb-icon"
                         @click="openCostEditDelete(scope.$index)"
@@ -236,21 +232,15 @@ import costFormAddEdit from "./costFormAddEdit";
 
 export default {
   name: "Account",
-  props: ["showModel", "sitem", "id", "type"],
+  props: ["showModel", "sitem", "id", "type", "newTime"],
   mixins: [resToken],
   components: { costFormAddEdit },
   watch: {
-    // showModel: function (val) {
-    //   this.showModelThis = val;
-    //   if (val) {
-    //     this.initForm();
-    //   }
-    // },
-    // showModelThis(val) {
-    //   if (!val) {
-    //     this.$emit("cancel");
-    //   }
-    // },
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   data() {
     const validate_sale_price = (rule, value, callback) => {

+ 6 - 6
src/views/sellOut/project/components/backGoodShow.vue

@@ -149,7 +149,7 @@ import columnsForm from "./columnsForm";
 import searchGoodOnlineTableModal from "./search-good-online-table-modal";
 export default {
   name: "backGoodShow",
-  props: ["showModel", "sitem", "id", "type"],
+  props: ["showModel", "sitem", "id", "type", " newTime"],
   mixins: [resToken],
   components: {
     searchGoodOnlineTableModal,
@@ -174,11 +174,11 @@ export default {
     //     this.initForm();
     //   }
     // },
-    // showModelThis(val) {
-    //   if (!val) {
-    //     this.$emit("cancel");
-    //   }
-    // },
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   data() {
     return {

+ 8 - 1
src/views/sellOut/project/components/buyGoodModal.vue

@@ -373,7 +373,7 @@ import inAddrModel from "@/components/in-addr-model";
 import { ShowDataTableColumns } from "./ShowDataTableColumns";
 export default {
   name: "buyGoodModal",
-  props: ["showModel", "sitem"],
+  props: ["showModel", "sitem", ""],
   mixins: [resToken],
   components: { searchStockGoodModal, inAddrModel },
   data() {
@@ -524,6 +524,8 @@ export default {
     },
     async next_goods() {
       const { order_addr } = this.addrForm;
+      const { num } = this.order_good[0];
+      let ta = 0;
       if (this.sendtype === "1" && order_addr && order_addr.length === 0) {
         this.$message.warning("直接发货需要录入地址!");
         return;
@@ -531,6 +533,7 @@ export default {
       let isedit = false;
       order_addr.forEach((e) => {
         if (e.edit) {
+          ta += receipt_quantity * 1;
           isedit = true;
         }
       });
@@ -538,6 +541,10 @@ export default {
         this.$message.warning("当前已有地址在编辑,请保存后再试!");
         return;
       }
+      if (this.sendtype === "1" && ta !== parseInt(num + "")) {
+        this.$message.warning("收货数量总数与购买数量总数不一致!");
+        return;
+      }
 
       console.log(this.sendtype);
       this.project_list[this.index].order_good[0].sendtype = this.sendtype;

+ 6 - 6
src/views/sellOut/project/components/grossForm.vue

@@ -53,7 +53,7 @@ import resToken from "@/mixins/resToken";
 
 export default {
   name: "Account",
-  props: ["showModel", "sitem", "id", "type"],
+  props: ["showModel", "sitem", "id", "type",'newTime'],
   mixins: [resToken],
   computed: {
     powers() {
@@ -75,11 +75,11 @@ export default {
     //     this.initForm();
     //   }
     // },
-    // showModelThis(val) {
-    //   if (!val) {
-    //     this.$emit("cancel");
-    //   }
-    // },
+       newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   data() {
     const validate_sale_price = (rule, value, callback) => {

+ 6 - 6
src/views/sellOut/project/components/setPlan.vue

@@ -362,7 +362,7 @@ import columnsForm from "./columnsForm";
 import buyGoodModal from "./buyGoodModal";
 export default {
   name: "setPlan",
-  props: ["showModel", "sitem", "id", "type"],
+  props: ["showModel", "sitem", "id", "type",'newTime'],
   mixins: [resToken],
   components: {
     buyGoodModal,
@@ -387,11 +387,11 @@ export default {
     //     this.initForm();
     //   }
     // },
-    // showModelThis(val) {
-    //   if (!val) {
-    //     this.$emit("cancel");
-    //   }
-    // },
+        newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
   },
   data() {
     return {

+ 0 - 56
src/views/sellOut/project/components/showForm.vue

@@ -1,56 +0,0 @@
-<template>
-  <div class="modal-form-style">
-    <el-form
-      ref="sitem"
-      :model="sitem"
-      status-icon
-      :rules="rulesThis"
-      label-width="110px"
-      id="demo-sitem"
-    >
-      <el-row v-if="sitem !== null">
-        <template v-for="item in columns">
-          <el-col :key="item.prop" :span="item.col" v-if="sitem[item.prop]">
-            <el-form-item :label="item.label + ':'">
-              <div>{{ sitem[item.prop] }}{{ item.unit }}</div>
-            </el-form-item>
-          </el-col>
-        </template>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-<script>
-import columns from "./columnsForm";
-export default {
-  name: "Account",
-  props: ["newTime", "sitem"],
-  data() {
-    return {
-      loading: false,
-      columns: columns,
-      sitem: null,
-    };
-  },
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
-  methods: {
-    
-
-    async initForm() {
-      this.loading = true;
-      this.loading = false;
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.account {
-}
-</style>

+ 11 - 2
src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -105,7 +105,6 @@
               scope.row.status === '2' ||
               scope.row.status === '5') &&
             status == '3'
-         
           "
           effect="dark"
           content="选择该商品"
@@ -181,6 +180,16 @@ export default {
       }
     },
   },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        const { is_project, status } = this.sitem;
+        this.is_project = is_project;
+        this.status = status;
+        this.searchList();
+      }
+    },
+  },
   data() {
     return {
       wantBmodel: false,
@@ -374,7 +383,7 @@ export default {
       this.bayGoodItem.in_arrival_time = arrival_time;
       this.bayGoodItem.in_num = num;
       this.bayGoodShowModel = true;
-      
+
       // console.log(row);
     },
     // 时间选择事件

+ 0 - 284
src/views/sellOut/zixunOrder/components/returnExpress.vue

@@ -1,284 +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-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
-              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="12">
-        <el-form-item label="物流公司" prop="company">
-          <search-express
-            :value="ruleForm.company"
-            :placeholder="'物流公司'"
-            :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>
-      </el-col>
-      <el-col :span="12">
-        <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
-            :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-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>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import asyncRequest from "@/apis/service/sellOut/zixunOrder";
-import resToken from "@/mixins/resToken";
-import { isAlphanumeric, isnumber } from "@/utils/validate";
-export default {
-  name: "zixunOrderDetail",
-  props: ["newTime", "sitem"],
-  mixins: [resToken],
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zixunOrderDetail"
-        ) || {};
-      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 === "") {
-        callback(new Error("物流单号不能为空!"));
-      } else {
-        if (!isAlphanumeric(value)) {
-          callback(new Error("物流单号格式不正确!"));
-        } else {
-          callback();
-        }
-      }
-    };
-    const validateexpressFee = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("物流费用不能为空!"));
-      } else {
-        if (isnumber(value)) {
-          callback();
-        } else if (isnumber2(value)) {
-          callback();
-        } else {
-          callback(new Error("物流费用只能为数字!"));
-        }
-      }
-    };
-    return {
-      options: [],
-      post_company:"",
-      smodel: {
-        value: "3",
-        label: "供应商承担",
-      },
-      code: "",
-      isShow: false,
-      loading: false,
-      status: "", //存储详情接口返的状态
-      showModelThis: this.showModel,
-      resign_name: "", //离职人
-      hand_name: "", //交接人
-      ruleForm: {
-        company: "", //入参快递公司
-        own: "1", //物流费用承担方
-        company: [], //物流公司
-        post_code: "", //物流单号
-        post_fee: 0, //物流费用
-      },
-      rulesThis: this.rules,
-      // 验证规则
-      rules: {
-        own: [
-          {
-            required: true,
-            trigger: "change",
-            message: "请选择物流费用承担方",
-          },
-        ],
-        company: [
-          {
-            type: "array",
-            required: true,
-            trigger: "change",
-            message: "请选择退回仓库",
-          },
-        ],
-        post_code: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validateexpress,
-          },
-        ],
-        post_fee: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validateexpressFee,
-          },
-        ],
-      },
-    };
-  },
-
-  mounted() {
-    this.initForm();
-  },
-  methods: {
-    closeAdd() {
-      this.showModelThis = false;
-    },
-    async initForm() {
-      this.loading = true;
-      let list = [
-        {
-          value: "1",
-          label: "个人承担",
-        },
-        {
-          value: "2",
-          label: "公司承担",
-        },
-      ];
-      this.options = [];
-      this.options.push(...list);
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
-    },
-
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          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: post_company ? [post_company] : [], //物流公司
-            post_code: post_code || "", //物流单号
-            post_fee: post_fee || "0", //物流费用
-          };
-          if (is_th === "1") {
-            this.options.push(this.smodel);
-          }
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.company = model.company.toString();
-          const res = await asyncRequest.afterPost(model);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "提交成功!",
-              message: "",
-            });
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    handleCompany(e) {
-      if (e && e.label) {
-        this.ruleForm.company = [e.label];
-      } else {
-        this.ruleForm.company = [];
-      }
-      this.$refs.ruleForm.validateField("company");
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 314
src/views/sellOut/zixunOrder/components/supplier_feedback.vue

@@ -1,314 +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="is_th">
-            <el-select
-              style="width: 100%"
-              :disabled="
-                !(status == '1' && powers.some((item) => item == '046'))
-              "
-              v-model="ruleForm.is_th"
-              placeholder="是否同意退回"
-            >
-              <el-option
-                v-for="item in is_th_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="remark">
-            <el-input
-              type="textarea"
-              placeholder="反馈备注"
-              :disabled="
-                !(status == '1' && powers.some((item) => item == '046'))
-              "
-              v-model="ruleForm.remark"
-              maxlength="250"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="ruleForm.is_th === '1'">
-        <el-col :span="12">
-          <el-form-item label="收件人" prop="contactor">
-            <el-input
-              :disabled="
-                !(status == '1' && powers.some((item) => item == '046'))
-              "
-              v-model="ruleForm.contactor"
-              placeholder="收件人"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="收件人电话" prop="mobile">
-            <el-input
-              :disabled="
-                !(status == '1' && powers.some((item) => item == '046'))
-              "
-              v-model="ruleForm.mobile"
-              placeholder="收件人电话"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="地址省市区" prop="addr_code">
-            <select-area
-              :placeholder="'省市区'"
-              :disabled="
-                !(status == '1' && powers.some((item) => item == '046'))
-              "
-              :value="ruleForm.addr_code"
-              :is-detail="id !== 'add'"
-              @selectChange="selectAreaAddr_code"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="详细地址" prop="addr">
-            <el-input
-              v-model="ruleForm.addr"
-              :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;padding:0 0 20px 0;"
-        v-if="status == '1' && powers.some((item) => item == '046')"
-      >
-        <el-button type="primary" :size="'mini'" @click="submitForm"
-          >保 存</el-button
-        >
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import { isMobile } from "@/utils/validate";
-import asyncRequest from "@/apis/service/sellOut/zixunOrder";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "zixunOrderDetail",
-  props: ["id", "showModelThis", "newTime", "sitem"],
-  mixins: [resToken],
-  data() {
-    const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空!"));
-      } else {
-        if (!isMobile(value)) {
-          callback(new Error("手机号格式不正确!"));
-        } else {
-          callback();
-        }
-      }
-    };
-    return {
-      loading: false,
-      status: "",
-      showModelThis: this.showModel,
-      ruleForm: {
-        is_th: "1", //是否同意退回
-        remark: "", //反馈备注
-        addr_code: [], //退货地址
-        addr: "", //退货详细地址
-        contactor: "", //收件人
-        mobile: "", //收件人电话
-        wsm_code: "-",
-      },
-      rulesThis: this.rules,
-      // 验证规则
-      rules: {
-        is_th: [
-          {
-            required: true,
-            trigger: "change",
-            message: "请选择是否同意退回",
-          },
-        ],
-        remark: [
-          {
-            required: true,
-            message: "请输入反馈备注",
-            trigger: "blur",
-          },
-        ],
-        addr_code: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择退回地址所在省/市/区",
-            trigger: "change",
-          },
-        ],
-        addr: [
-          {
-            required: true,
-            message: "请输入详细退货地址",
-            trigger: "blur",
-          },
-        ],
-        contactor: [
-          {
-            required: true,
-            message: "请输入收件人",
-            trigger: "blur",
-          },
-        ],
-        mobile: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatemobile,
-          },
-        ],
-      },
-      is_th_options: [
-        {
-          value: "1",
-          label: "同意退回",
-        },
-        {
-          value: "0",
-          label: "拒绝退回",
-        },
-      ],
-    };
-  },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zixunOrderDetail"
-        ) || {};
-      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;
-    },
-    async initForm() {
-      this.status = "";
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
-    },
-
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const {
-            contactor,
-            is_th,
-            mobile,
-            addr_code,
-            addr,
-            returnCode,
-            gys_remark,
-            status,
-          } = this.sitem;
-          let list = [];
-          this.status = status;
-          if (
-            addr_code &&
-            addr_code.area_code &&
-            addr_code.city_code &&
-            addr_code.provice_code
-          ) {
-            list.push(addr_code.provice_code);
-            list.push(addr_code.city_code);
-            list.push(addr_code.area_code);
-          }
-
-          this.ruleForm = {
-            returnCode: returnCode || "",
-            is_th: is_th || "1", //是否同意退回
-            remark: gys_remark || "", //反馈备注
-            addr_code: list.length === 3 ? list : [], //退货地址
-            addr: addr || "", //退货详细地址
-            contactor: contactor || "", //收件人
-            mobile: mobile || "", //收件人电话
-            wsm_code: "-",
-          };
-          console.log(this.ruleForm);
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          this.loading = true;
-
-          let res = await asyncRequest.aftergys(model);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "提交成功!",
-              message: "",
-            });
-            this.$emit("refresh", false);
-          } 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;
-        }
-      });
-    },
-
-    //退货省市区
-    selectAreaAddr_code(e) {
-      this.ruleForm.addr_code = e;
-      this.$refs.ruleForm.validateField("addr_code");
-    },
-  },
-};
-</script>

+ 2 - 8
src/views/sellOut/zixunOrder/detail.vue

@@ -103,10 +103,7 @@ import addForm from "./components/addEditForm";
 import editForm from "./components/editForm";
 import feedbackList from "./components/feedbackList";
 import { editColumns } from "./components/ShowDataTableColumns";
-// import grossForm from "./components/grossForm";
-// import financeExamOneForm from "./components/finance-exam-one-form";
-// import financeExamTwoForm from "./components/finance-exam-two-form";
-// import financeExamThreeForm from "./components/finance-exam-three-form";
+
 export default {
   name: "zixunOrderDetail",
   mixins: [resToken],
@@ -114,11 +111,8 @@ export default {
     addForm,
     editForm,
     feedbackList,
-    // grossForm,
-    // financeExamOneForm,
-    // financeExamTwoForm,
-    // financeExamThreeForm,
   },
+  
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {