12

src/views/sellOut/returnOrder/addEdit.vue

@@ -1,362 +1,2 @@
-<template>
-  <el-dialog
-    :title="title"
-    :center="true"
-    align="left"
-    top="5vh"
-    width="1040px"
-    @close="closeModel"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    v-loading="loading"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-  >
-    <el-card>
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-form
-            :model="ruleForm"
-            status-icon
-            :rules="rulesThis"
-            ref="ruleForm"
-            label-width="110px"
-            class="demo-ruleForm"
-          >
-            <el-form-item
-              label="登录名"
-              prop="loginName"
-              v-if="id === 'add' || isDetail"
-            >
-              <el-input
-                v-model="ruleForm.loginName"
-                :disabled="isDetail"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="姓名" prop="fullName">
-              <el-input
-                v-model="ruleForm.fullName"
-                :disabled="isDetail"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="手机号" prop="tel">
-              <el-input v-model="ruleForm.tel" :disabled="isDetail"></el-input>
-            </el-form-item>
-            <el-form-item label="密码" prop="password" v-if="id === 'add'">
-              <el-input
-                type="password"
-                placeholder="密码"
-                :maxlength="20"
-                v-model="ruleForm.password"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="确认密码" prop="password2" v-if="id === 'add'">
-              <el-input
-                type="password"
-                placeholder="再次输入密码"
-                :maxlength="20"
-                v-model="ruleForm.password2"
-              ></el-input>
-            </el-form-item>
-          </el-form>
-        </el-col>
-        <el-col :span="24" style="text-align: right;">
-          <el-button type="primary" @click="submitForm" v-if="!isDetail"
-            >保 存
-          </el-button>
-          <el-button @click="showModelThis = false">{{ isDetail ? "关 闭" : "取 消" }}</el-button>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-   </template>
-   <script>
-   import asyncRequest from "@/apis/service/sellOut/returnOrder";
-   import resToken from "@/mixins/resToken";
-   import {
-    isnumber,
-    isMobile,
-    validEmail,
-    isAlphanumeric,
-    isChinese,
-    isEmoticon,
-    validAlphabets,
-  } from "@/utils/validate";
-   export default {
-    name: 'returnOrder',
-    props: ["showModel", "id", "isDetail","sitem"],
-    mixins: [resToken],
-    data() {
-      const validateusername = (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("账号不能为空！"));
-        } else {
-          if (value.length < 6 || value.length > 18) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
-          } else {
-            if (isnumber(value)) {
-              callback(new Error("账号规则为6~18位数字与字母组合！"));
-            } else if (validAlphabets(value)) {
-              callback(new Error("账号规则为6~18位数字与字母组合！"));
-            } else if (!isAlphanumeric(value)) {
-              callback(new Error("账号规则为6~18位数字与字母组合！"));
-            } else {
-              callback();
-            }
-          }
-        }
-      };
-      const validatename = (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("真实姓名不能为空！"));
-        } else {
-          if (value.length < 2 || value.length > 12) {
-            callback(new Error("真实姓名规则为2~12位汉字！"));
-          } else {
-            if (!isChinese(value)) {
-              console.log(9999);
-              callback(new Error("真实姓名规则为2~12位汉字！"));
-            } else if (isEmoticon(value)) {
-              console.log(2345);
-              callback(new Error("真实姓名规则为2~12位汉字！"));
-            } else {
-              callback();
-            }
-          }
-        }
-      };
-      const validatemobile = (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("手机号不能为空！"));
-        } else {
-          if (!isMobile(value)) {
-            callback(new Error("手机号格式不正确！"));
-          } else {
-            callback();
-          }
-        }
-      };
-  
-      const validateEmail = (rule, value, callback) => {
-        if (value === "") {
-          callback();
-        } else {
-          if (!validEmail(value)) {
-            callback(new Error("邮箱格式不正确！"));
-          } else {
-            callback();
-          }
-        }
-      };
-      return {
-        loading: false,
-        title: "添加账号",
-        showModelThis: this.showModel,
-        ruleForm: {
-          username: "", // 账号
-          name: "", // 真实姓名
-          mobile: "",
-          email: "",
-          role_id: "",
-          status: "1",
-          item: [],
-        },
-        rulesThis: this.rules,
-        rules: {
-          name: [
-            {
-              required: true,
-              validator: validatename,
-              trigger: "blur",
-            },
-          ],
-          username: [
-            {
-              required: true,
-              validator: validateusername,
-              trigger: "blur",
-            },
-          ],
-          mobile: [
-            {
-              required: true,
-              validator: validatemobile,
-              trigger: "blur",
-            },
-          ],
-          email: [
-            {
-              required: false,
-              validator: validateEmail,
-              trigger: "blur",
-            },
-          ],
-          role_id: [
-            {
-              required: true,
-              message: "请选择角色",
-              trigger: "change",
-            },
-          ],
-          item: [
-            {
-              type: "array",
-              required: true,
-              message: "请选择所在部门",
-              trigger: "change",
-            },
-          ],
-          status: [
-            {
-              required: true,
-              message: "请选择状态",
-              trigger: "change",
-            },
-          ],
-        }
-      };
-    },
-    watch: {
-      showModel: function(val) {
-        this.showModelThis = val;
-        if (val) {
-          this.initForm();
-        }
-      },
-      showModelThis(val) {
-        if (!val) {
-          this.$emit("cancel");
-        }
-      }
-    },
-    methods: {
-      closeModel() {
-        console.log("closeModel!!");
-      },
-      async initForm() {
-        this.loading = true;
-        // await this.getRole();
-        if (this.id === "add") {
-          this.title = "添加账号";
-          this.rulesThis = this.rules;
-          await this.resetForm();
-        } else {
-          if (this.isDetail) {
-            this.title = "账号详情";
-            this.rulesThis = {};
-          } else {
-            this.title = "修改账号";
-            this.rulesThis = this.rules;
-          }
-          await this.resetForm(this.sitem);
-          // await this.initData()
-        }
-        this.loading = false;
-      },
-      // async getRole() {
-      //   const model = {
-      //     status: "", // 状态
-      //     level: "", // 姓名
-      //     role_name: "",
-      //   };
-      //   const res = await asyncRequest.getRole(model);
-      //   if (res && res.code === 0 && res.data) {
-      //     this.roleList = res.data;
-      //     this.roleList.map((v1) => {
-      //       v1.id += "";
-      //       v1.status += "";
-      //       return v1;
-      //     });
-      //   }
-      // },
-      async initData() {
-        const res = await asyncRequest.detail({ id: this.id });
-      if (res && res.code === 0 && res.data) {
-        this.ruleForm = res.data;
-        this.ruleForm.role_id = this.ruleForm.role;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-      },
-      async resetForm(sitem) {
-        // 重置
-        await this.$nextTick(() => {
-          if (this.$refs.ruleForm) {
-            this.$refs.ruleForm.resetFields();
-            this.$refs.ruleForm.clearValidate();
-            const { username, nickname, mobile, email, roleid, status, item } =
-              sitem;
-            this.ruleForm = {
-              username: username || "", // 账号
-              name: nickname || "", // 真实姓名
-              mobile: mobile || "",
-              email: email || "",
-              role_id: roleid || "",
-              status: status || "",
-              item: item || [],
-            };
-            if (this.id === "add" || this.isDetail) {
-              this.rules.username[0].required = false;
-            }
-          }
-        });
-      },
-    
-      async submitForm() {
-        await this.$refs.ruleForm.validate(async (valid) => {
-          if (valid) {
-            this.loading = true;
-            const { username, name, mobile, email, role_id, status } = JSON.parse(
-              JSON.stringify(this.ruleForm)
-            );
-            const model = {
-              id: this.id,
-              username: username || "", // 账号
-              nickname: name || "", // 真实姓名
-              mobile: mobile || "",
-              email: email || "",
-              role: role_id || "",
-              status: status || "",
-            };
-            let res = {};
-            if (this.id === "add") {
-              delete model["id"];
-              res = await asyncRequest.add(model);
-            } else {
-              res = await asyncRequest.update(model);
-            }
-            this.loading = false;
-            if (res && res.code === 0) {
-              const title = this.id === "add" ? "添加成功" : "修改成功";
-              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;
-          }
-        });
-      },
-    },
- 
-  };
-  </script>
 
-   <style lang="scss" scoped>
-   .returnOrder {
-    
-   }
-   </style>
    

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

@@ -0,0 +1,252 @@
+<template>
+  <el-dialog
+    :title="title"
+    :center="true"
+    align="left"
+    top="5vh"
+    width="1040px"
+    @close="closeModel"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    v-loading="loading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+  >
+    <el-card>
+      this.showModel,{{ showModel }} showModelThis:{{ showModelThis }}
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            ref="ruleForm"
+            label-width="110px"
+            class="demo-ruleForm"
+          >
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="异常数量" prop="numbers">
+                  <el-input
+                    :disabled="disabled"
+                    v-model="ruleForm.numbers"
+                    placeholder="请输入异常数量"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="异常原因" prop="reason">
+                  <el-select
+                    @change="handleValue"
+                    style="width: 100%"
+                    :disabled="disabled"
+                    v-model="ruleForm.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="remark">
+                  <el-input
+                    type="textarea"
+                    placeholder="请输入异常原因备注"
+                    v-model="ruleForm.remark"
+                    :disabled="disabled"
+                    maxlength="250"
+                    show-word-limit
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="24" style="text-align: right">
+          <el-button type="primary" @click="submitForm" v-if="!isDetail"
+            >保 存
+          </el-button>
+          <el-button @click="showModelThis = false">{{
+            isDetail ? "关 闭" : "取 消"
+          }}</el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+   <script>
+import asyncRequest from "@/apis/service/sellOut/returnOrder";
+import resToken from "@/mixins/resToken";
+import { isnumber } from "@/utils/validate";
+export default {
+  name: "returnOrder",
+  props: ["showModel", "id", "isDetail", "sitem"],
+  mixins: [resToken],
+  data() {
+    const validatenumbers = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("异常数量不能为空！"));
+      } else {
+        if (!isnumber(value)) {
+          callback(new Error("异常数量必须为数字"));
+        } else {
+          callback();
+        }
+      }
+    };
+    return {
+      loading: false,
+      title: "添加异常情况",
+      showModelThis: this.showModel,
+      ruleForm: {
+        numbers: "", //异常数量
+        reason: "", //异常原因
+        remark: "", //异常备注
+        name: "",
+        status: "1",
+      },
+      reason_options: [],
+      rulesThis: this.rules,
+      rules: {
+        numbers: [
+          {
+            required: true,
+            validator: validatenumbers,
+            trigger: "blur",
+          },
+        ],
+        reason: [
+          {
+            required: true,
+            // validator: validateusername,
+            message: "请输入异常原因",
+            trigger: "blur",
+          },
+        ],
+        remark: [
+          {
+            required: true,
+            message: "请填写异常原因备注",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        console.log("int:" + val);
+        this.initForm();
+      }
+    },
+    showModelThis(val) {
+      console.log(val);
+      if (!val) {
+        console.log("out:" + val);
+        this.$emit("cancel");
+      }
+    },
+  },
+  // created() {
+  //   this.initForm();
+  // },
+  methods: {
+    closeModel() {
+      console.log("closeModel!!");
+    },
+    async initForm() {
+      console.log("1234567890");
+      await this.getReason();
+      this.loading = true;
+      // await this.getRole();
+      // if (this.id === "add") {
+      //   this.title = "添加账号";
+      //   this.rulesThis = this.rules;
+      //   await this.resetForm();
+      // } else {
+      //   if (this.isDetail) {
+      //     this.title = "账号详情";
+      //     this.rulesThis = {};
+      //   } else {
+      // this.title = "修改账号";
+      this.rulesThis = this.rules;
+      // }
+      await this.resetForm();
+      // await this.initData()
+      // }
+      this.loading = false;
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+
+          this.ruleForm = {
+            numbers: "", //异常数量
+            reason: "", //异常原因
+            remark: "", //异常备注
+            name: "",
+          };
+        }
+      });
+    },
+
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          // this.loading = true;
+          this.showModelThis = false;
+          console.log(this.ruleForm);
+          this.$emit("refresh", this.ruleForm);
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    // 异常原因
+    async getReason() {
+      let model = {
+        type: "2",
+        page: 1,
+        size: 100,
+      };
+      const res = await asyncRequest.resultlist(model);
+      this.loading = false;
+      if (res && res.code === 0) {
+        console.log(res.data);
+        this.reason_options = res.data.list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+    handleValue(e) {
+      console.log(e);
+      this.reason_options.forEach((item) => {
+        if (item.result_code === e) {
+          this.ruleForm.name = item.result;
+        }
+      });
+      console.log(this.name);
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+</style>
+   

src/views/sellOut/returnOrder/components/return-record copy.vue

@@ -1,276 +0,0 @@
-<template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    label-width="120px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="收货总数量" prop="get_goods_numbers">
-          <el-input
-            v-model="ruleForm.get_goods_numbers"
-            placeholder="收货总数量"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="可销售数量" prop="can_sell_numbers">
-          <el-input
-            v-model="ruleForm.can_sell_numbers"
-            placeholder="可销售数量"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="其他备注" prop="remark">
-          <el-input
-            type="textarea"
-            maxlength="250"
-            show-word-limit
-            placeholder="请填写备注"
-            v-model="ruleForm.remark"
-          >
-          </el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="异常情况记录" prop="tableCheck">
-          <span>异常情况记录</span>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row>
-      <el-col :span="24" style="text-align: right">
-        <el-button type="primary" @click="submitForm" v-if="true"
-          >保 存</el-button
-        >
-        <!-- id === 'add' ||
-            (status === '0' && powers.some((item) => item == '005')) -->
-        <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 asyncRequest from "@/apis/service/goodsService";
-import resToken from "@/mixins/resToken";
-import { isnumber } from "@/utils/validate.js";
-export default {
-  name: "purchase_check",
-  props: ["id", "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 {
-      loading: false,
-      status: "", //存储详情接口返的状态
-      showModelThis: this.showModel,
-      resign_name: "", //离职人
-      hand_name: "", //交接人
-      ruleForm: {
-        get_goods_numbers: "", //收货总数量
-        can_sell_numbers: "", //可销售数量
-        remark: "", //其他备注
-      },
-      rulesThis: this.rules,
-      // 验证规则
-      rules: {
-        get_goods_numbers: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatenumbers,
-          },
-        ],
-        can_sell_numbers: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatenumbers,
-          },
-        ],
-        remark: [
-          {
-            required: true,
-            trigger: "blur",
-            message: "请填写备注信息",
-          },
-        ],
-        tableCheck: [
-          {
-            required: true,
-            trigger: "blur",
-            message: "请填写记录",
-          },
-        ],
-      },
-    };
-  },
-  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() {
-  //   console.log(this.id);
-  //   this.initForm();
-  // },
-  created() {
-    this.initForm();
-  },
-  watch: {
-    id: function (val) {
-      console.log(val);
-      if (val) {
-        this.initForm();
-      }
-    },
-    newTime: function (val) {
-      console.log(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;
-        await this.resetForm();
-      } else {
-        this.rulesThis = this.rules;
-        await this.resetForm();
-        // await this.initData();
-      }
-      this.loading = false;
-    },
-
-    async resetForm() {
-      this.resign_name = "";
-      this.hand_name = "";
-      this.status = "";
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.ruleForm = {
-            return_store: "", //退回仓库
-            return_goods_addr: [], //退货地址
-            addr_detail: "", //退货详细地址
-            addressee: "", //收件人
-            addressee_phone: "", //收件人电话
-            express_require: "", //物流要求
-          };
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          const model = {
-            id: this.id,
-            resign_uid: rUid,
-            hand_uid: hUid,
-          };
-          let res = {};
-          if (this.id === "add") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
-
-          this.loading = false;
-          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;
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/sellOut/returnOrder/components/return-record.vue

@@ -219,18 +219,26 @@
         >
       </el-col>
     </el-row>
+    showModel{{ showModel }}--
+    <add-edit
+      :id="modelId"
+      :sitem="sitem"
+      :show-model="showModel"
+      @refresh="handleValue"
+      @cancel="handleCancel"
+    />
   </el-form>
 </template>
 <script>
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate.js";
-import AnomalousRecord from "./anomalous-record.vue";
+import addEdit from "./addEdit.vue";
 export default {
   name: "returnRecord",
   props: ["id", "showModelThis", "newTime"],
   mixins: [resToken],
-  components: { AnomalousRecord },
+  components: { addEdit },
   data() {
     const validatenumbers = (rule, value, callback) => {
       if (value === "") {
@@ -252,18 +260,19 @@ export default {
         product_go: [],
       },
       voList: [
-        {
-          anomalous_numbers: 99,
-          anomalous_reason: "",
-          anomalous_reason_code: "", //异常原因code
-          anomalous_remark: "111",
-        },
+        // {
+        //   anomalous_numbers: 99,
+        //   anomalous_reason: "",
+        //   anomalous_reason_code: "", //异常原因code
+        //   anomalous_remark: "111",
+        // },
       ],
       edit: false, //默认不能提交
       totalNumber: 0, //全局保存数量
       loading: false,
       status: "", //存储详情接口返的状态
-      showModelThis: this.showModel,
+      showModel: null,
+      // showModelThis: this.showModel,
       ruleForm: {
         get_goods_numbers: "", //收货总数量
         can_sell_numbers: "", //可销售数量
@@ -338,7 +347,6 @@ export default {
     // },
     async initForm() {
       this.loading = true;
-      this.columns = [];
       this.rulesThis = this.rules;
       await this.getresultlist();
       await this.resetForm();
@@ -355,16 +363,16 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
-            get_goods_numbers: "100", //收货总数量
-            can_sell_numbers: "100", //可销售数量
+            get_goods_numbers: "", //收货总数量
+            can_sell_numbers: "", //可销售数量
             remark: "50", //其他备注
           };
-          let list = JSON.parse(JSON.stringify(this.voList));
-          console.log(list);
-          list.forEach((v) => {
-            v.edit = false;
-            this.tableForm.product_go.push(v);
-          });
+          // let list = JSON.parse(JSON.stringify(this.voList));
+          // console.log(list);
+          // list.forEach((v) => {
+          //   v.edit = false;
+          //   this.tableForm.product_go.push(v);
+          // });
         }
       });
     },
@@ -397,19 +405,17 @@ export default {
               +get_goods_numbers
             );
             console.log(this.edit);
-
-            // console.log(this.tableForm.product_go);
-            // if(can_sell_numbers +  == get_goods_numbers){
-
-            // }
           }
+          console.log(this.edit);
+          console.log(+this.totalNumber, +can_sell_numbers, +get_goods_numbers);
+          console.log();
           if (
             this.edit &&
-            +this.totalNumber + +can_sell_numbers != +get_goods_numbers
+            +this.totalNumber + +can_sell_numbers == +get_goods_numbers
           ) {
-            this.$message.warning("请填写异常数量！");
+            console.log("submit");
           } else {
-            console.log("提交");
+            this.$message.warning("请填写异常数量！");
           }
           this.totalNumber = 0;
           // if (!this.tableForm.product_go.edit) {
@@ -522,7 +528,39 @@ export default {
       this.btn_code = btn_code;
       this.modelId = code;
       this.showModel = true;
-      this.$emit("openModel");
+      console.log(this.showModel, "this.showModel");
+    },
+    // 获取弹窗的值
+    handleValue(e) {
+      console.log(e);
+      if (e) {
+        const { numbers, reason, remark, name } = e;
+        let v = {
+          anomalous_numbers: numbers || "",
+          anomalous_reason: name || "",
+          anomalous_reason_code: name || "", //异常原因code
+          anomalous_remark: remark || "",
+        };
+        let list = JSON.parse(JSON.stringify(this.voList));
+        list.forEach((v) => {
+          v.edit = false;
+          this.tableForm.product_go.push(v);
+        });
+        this.voList = [];
+        this.voList.push(v);
+      }
+      // this.initForm();
+      let list = JSON.parse(JSON.stringify(this.voList));
+      list.forEach((v) => {
+        v.edit = false;
+        this.tableForm.product_go.push(v);
+      });
+      this.voList = [];
+    },
+    handleCancel(e) {
+      console.log("back:" + e);
+      this.showModel = false;
+      console.log(this.showModel);
     },
   },
 };

src/views/sellOut/returnOrder/index.vue

@@ -201,14 +201,14 @@
           </el-tooltip>
         </template>
       </ex-table>
-      <add-edit
+      <!-- <add-edit
         :id="modelId"
         :sitem="sitem"
         :show-model="showModel"
         :is-detail="isDetail"
         @refresh="searchList"
         @cancel="showModel = false"
-      />
+      /> -->
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -220,15 +220,15 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
-import addEdit from "./addEdit";
+// import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 import columns from "./columns";
 export default {
   name: "returnOrder",
   mixins: [mixinPage, resToken],
-  components: {
-    addEdit,
-  },
+  // components: {
+  //   addEdit,
+  // },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {