From 8d50585d4df2b2e8e3b54cb1a365a7d20db6b9c9 Mon Sep 17 00:00:00 2001
From: Wangxubin1999 <wangxubin1999@yeah.net>
Date: Tue, 25 Oct 2022 16:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storeManage.js                        |  15 ++
 .../eashier/repayment/components/index.vue    |   2 +-
 .../baseStaff/components/editothers.vue       | 148 ++++++++++++++++++
 .../storeManage/baseStaff/components/text.vue |  17 ++
 .../baseStaff/components/tostore/index.vue    |  48 +++---
 5 files changed, 209 insertions(+), 21 deletions(-)
 create mode 100644 src/pages/storeManage/baseStaff/components/editothers.vue
 create mode 100644 src/pages/storeManage/baseStaff/components/text.vue

diff --git a/src/api/storeManage.js b/src/api/storeManage.js
index f5f0fb2..b114b9d 100644
--- a/src/api/storeManage.js
+++ b/src/api/storeManage.js
@@ -129,6 +129,21 @@ export function selectOne(params) {
     data: params
   });
 }
+export function selectPage(params) {
+  return service({
+    url: "/api" + "/demay/ssm/storeConversion/selectPage",
+    method: "post",
+    data: params
+  });
+}
+export function checkHumam(params) {
+  return service({
+    url: "/api" + "/demay/ssm/storeConversion/check",
+    method: "post",
+    data: params
+  });
+}
+
 // 员工月度任务
 export function monthJob(params) {
   return service({
diff --git a/src/pages/eashier/repayment/components/index.vue b/src/pages/eashier/repayment/components/index.vue
index e3ed124..c954e71 100644
--- a/src/pages/eashier/repayment/components/index.vue
+++ b/src/pages/eashier/repayment/components/index.vue
@@ -21,7 +21,7 @@
           {{form.mobilePhone}}
         </div>
       </el-form-item>
-      <el-form-item label="补单日期:" v-if="form.additionDate">
+      <el-form-item label="补单日期:" v-if="form.additionDate&&form.isAddition==1">
         <div class="form-width-xxs">
           {{form.additionDate}}
         </div>
diff --git a/src/pages/storeManage/baseStaff/components/editothers.vue b/src/pages/storeManage/baseStaff/components/editothers.vue
new file mode 100644
index 0000000..c0816c0
--- /dev/null
+++ b/src/pages/storeManage/baseStaff/components/editothers.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog
+    :close-on-click-modal="false"
+    :title="title + '批量确认'"
+    :visible.sync="dialogFormVisible"
+    width="70vw"
+    v-dialogDrag
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="from"
+      :model="from"
+      label-position="right"
+      label-width="100px"
+    >
+      <el-form-item>
+        <div
+          v-for="(item, index) in from.rows"
+          :key="index"
+          style="width: 48%;border: 1px solid #DCDFE6;border-radius: 20px;margin-left: 2%;padding: 10px;"
+        >
+          <el-form-item :prop="'rows.' + index + '.staffName'" label="员工姓名">
+            <el-input v-model="item.staffName" disabled />
+          </el-form-item>
+
+          <el-form-item :prop="'rows.' + index + '.staffNum'" label="员工编号">
+            <el-input v-model="item.staffNum" disabled />
+          </el-form-item>
+
+          <el-form-item :prop="'rows.' + index + '.brandNumber'" label="水牌号">
+            <el-input v-model="item.brandNumber" clearable />
+          </el-form-item>
+
+          <texts v-show="item.tag == 1" />
+        </div>
+      </el-form-item>
+      <el-form-item>
+        <div
+          style="width:100%;display:flex ;justify-content: center;align-items:center;"
+        >
+          <el-button
+            type="primary"
+            @click="inspect()"
+            style="margin-right: 60px;"
+            >检测</el-button
+          >
+          <el-button @click="confirm">确定</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { checkHumam, editStateStoreConversions } from "@/api/storeManage.js";
+import { re } from "semver";
+import texts from "./text";
+export default {
+  components: { texts },
+  data() {
+    return {
+      dialogFormVisible: false, //弹窗开关
+      title: "", //弹窗标题
+      from: {}, //主对象
+      sessionStorageData: JSON.parse(
+        sessionStorage.getItem("sessionStorageData")
+      ) //门店参数合集
+    };
+  },
+  methods: {
+    //关闭弹窗前的回调方法
+    handleClose() {
+      this.form = {};
+      this.dialogFormVisible = false;
+      // this.$refs.form.clearValidate();
+    },
+    //组件传值
+    show(row) {
+      this.from = { ...row };
+      console.log(
+        "🚀 ~ file: editothers.vue ~ line 64 ~ show ~ this.from",
+        this.from.rows
+      );
+      this.dialogFormVisible = true;
+    },
+    //检查方法
+    inspect() {
+      console.log(
+        "🚀 ~ file: editothers.vue ~ line 87 ~ this.form.rows.forEach ~ this.form.rows",
+        this.from.rows
+      );
+      let arrayNum = [];
+      this.from.rows.forEach(item => {
+        let arr = {};
+        arr.id = item.id;
+        arr.brandNumber = item.brandNumber;
+        arrayNum.push(arr);
+      });
+      checkHumam(arrayNum).then(res => {
+        this.from.rows = res.rows;
+        this.$alert(res.message, "提示", {
+          confirmButtonText: "确定",
+          confirmButtonClass: "confirmbtnFalses",
+          type: "success",
+          center: true,
+          callback: action => {}
+        });
+      });
+    },
+    //确定返回方法
+    confirm() {
+      let arrayNum = [];
+      this.from.rows.forEach(item => {
+        let arr = {};
+        arr.id = item.id;
+        arr.brandNumber = item.brandNumber;
+        arrayNum.push(arr);
+      });
+      editStateStoreConversions(arrayNum).then(res => {
+        if (res.code == "000000") {
+          this.$message.success({
+            message: res.message
+          });
+          this.$emit("editData");
+          this.dialogFormVisible = false;
+        } else {
+          this.from.rows = res.rows;
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "success",
+            center: true,
+            callback: action => {}
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style>
+.el-form-item__content {
+  display: flex !important;
+  flex-wrap: wrap !important;
+  margin-left: 0px !important;
+}
+</style>
diff --git a/src/pages/storeManage/baseStaff/components/text.vue b/src/pages/storeManage/baseStaff/components/text.vue
new file mode 100644
index 0000000..c08e07a
--- /dev/null
+++ b/src/pages/storeManage/baseStaff/components/text.vue
@@ -0,0 +1,17 @@
+<template>
+    <div style="color: red;margin-left: 45px;">*水牌号已存在请重新输入</div>
+</template>
+  
+  <script>
+  
+  export default {
+    data() {
+      return {
+      }
+    },
+  };
+  </script>
+  
+  <style>
+  </style>
+  
\ No newline at end of file
diff --git a/src/pages/storeManage/baseStaff/components/tostore/index.vue b/src/pages/storeManage/baseStaff/components/tostore/index.vue
index a4943fd..74996a5 100644
--- a/src/pages/storeManage/baseStaff/components/tostore/index.vue
+++ b/src/pages/storeManage/baseStaff/components/tostore/index.vue
@@ -61,6 +61,7 @@
     </div>
     <edit ref="edit" @editData="getData"></edit>
     <editother ref="editother" @editData="getData"></editother>
+    <editothers ref="editothers" @editData="getData"></editothers>
   </div>
 </template>
 
@@ -69,14 +70,15 @@ import {
   storeConversionPage,
   editStateStoreConversionPage,
   editStateStoreConversions,
-  selectOne
+  selectOne,
+  selectPage
 } from "@/api/storeManage.js";
 
 import edit from "./edit.vue";
 import editother from "../editother.vue";
-
+import editothers from "../editothers.vue";
 export default {
-  components: { edit,editother },
+  components: { edit,editother,editothers },
   data() {
     return {
       dialogFormVisible: false,
@@ -123,7 +125,9 @@ export default {
       this.selection.forEach((item) => {
         list.push(item.id);
       });
-      let form = { statu: 2, ids: list };
+      let form = {ids: list };
+      
+      console.log("🚀 ~ file: index.vue ~ line 129 ~ quers ~ form", form)
       this.confirms(form);
     },
     confirm(row) {
@@ -149,22 +153,26 @@ export default {
         });
     },
     confirms(row) {
-      editStateStoreConversions(row).then((res) => {
-        if (res.code == "000000") {
-          this.getData();
-          this.$message.success({
-                  message: res.message,
-                });
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
+     
+      selectPage(row)
+        .then((res) => {
+          if ((res.code = "000000")) {
+            this.$refs.editothers.show(res, "修改",'转门店');
+          } else {
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        })
+        .catch((err) => {
+          //console.log(err);
+        });
+      
+      // this.$refs.editothers.show(row);
     },
     //分页方法
     handleSizeChange(val) {