项目，转门店修改

src/api/storeManage.js

@@ -945,6 +945,13 @@ export function editStateStoreConversion(params) {
   });
 }
 
+export function editStateStoreConversions(params) {
+  return service({
+    url: "/api" + "/demay/ssm/storeConversion/updateStatu2",
+    method: "post",
+    data: params
+  });
+}
 // 添加门店员工转店申请查询
 export function storeConversionPage(params) {
   return service({

src/pages/eashier/collectionList/collectionList.vue

@@ -1166,7 +1166,9 @@ export default {
               confirmButtonClass: "confirmbtnFalses",
               type: "warning",
               center: true,
-              callback: (action) => {},
+              callback: (action) => {
+                
+              },
             });
           }
         });

src/pages/storeManage/baseProject/components/edit.vue

@@ -149,6 +149,7 @@ export default {
       sessionStorageData: JSON.parse(
         sessionStorage.getItem("sessionStorageData")
       ),
+      format: "YYYY-MM-DD hh:mm:ss",
       rules: {
         projectTypeName: {
           required: true,
@@ -391,6 +392,7 @@ export default {
                   if (res.code == "000000") {
                     this.dialogFormVisible = false;
                     this.$emit("editData");
+                    
                     this.$message.success({
                       message: res.message,
                     });

src/pages/storeManage/baseStaff/components/edit.vue

@@ -64,7 +64,7 @@
         <el-cascader :disabled="title=='查看'" class="form-width" v-model="form.grade" :options="grade" :emitPath="false" :show-all-levels="false" @change="gradechange"></el-cascader>
       </el-form-item>
       <el-form-item label="工种">
-        <el-select :disabled="title=='查看'" v-model="form.wordTypeName" placeholder="请选择" @change="jobchange">
+        <el-select :disabled="title=='查看'" v-model="form.wordTypeName" placeholder="请选择" >
           <el-option v-for="item in jobList" :key="item.id" :label="item.wordTypeName" :value="item.id">
           </el-option>
         </el-select>
@@ -420,17 +420,7 @@ export default {
       }
     },
     //工种改变方法
-    jobchange(e) {
-      console.log(e);
-      this.jobList.forEach((item) => {
-        if (item.id == e) {
-          this.form.wordTypeNum = item.wordTypeNum;
-          this.form.wordTypeName = item.wordTypeName;
-          this.form.wordTypeId = item.id;
-          console.log(this.form);
-        }
-      });
-    },
+   
     //确定返回方法
     confirm() {
       this.$refs.form.validate((v) => {

src/pages/storeManage/baseStaff/components/editother.vue

@@ -24,7 +24,7 @@
       
       
       <el-form-item label="工种">
-        <el-select :disabled="title=='修改'" v-model="form.wordTypeName" placeholder="请选择" @change="jobchange">
+        <el-select :disabled="title=='修改'" v-model="form.wordTypeName" placeholder="请选择" >
           <el-option v-for="item in jobList" :key="item.id" :label="item.wordTypeName" :value="item.id">
           </el-option>
         </el-select>
@@ -60,8 +60,10 @@ import {
   pageBasePost,
   pageBaseWorkType,
   reinstated,
-  staffStart
+  staffStart,
+  editStateStoreConversion
 } from "@/api/storeManage.js";
+
 export default {
   data() {
     return {
@@ -260,6 +262,7 @@ export default {
         this.title = title;
       }
       this.dialogFormVisible = true;
+      console.log(row)
       this.getData();
     },
     //获取数据
@@ -317,7 +320,8 @@ export default {
             .catch((err) => {
               console.error(err);
             });
-      }else{
+      }else if(this.type=="启用"){
+        
         staffStart({ id: this.rowForm.id, mobilePhone: this.rowForm.mobilePhone,brandNumber:this.form.brandNumber }).then(
             (res) => {
               console.log(res);
@@ -338,6 +342,24 @@ export default {
               }
             }
           );
+        
+      }else{
+        
+        editStateStoreConversion({ ids: this.rowForm.ids, mobilePhone: this.rowForm.mobilePhone,brandNumber:this.form.brandNumber,statu:2 }).then((res) => {
+        if (res.code == "000000") {
+          this.$emit("editData");
+                this.dialogFormVisible = false;
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+      // console.log("🚀 ~ file: editother.vue ~ line 362 ~ //editStateStoreConversion ~ this.rowForm", this.rowForm)
       }
       
     },

src/pages/storeManage/baseStaff/components/tostore/index.vue

@@ -60,6 +60,7 @@
       <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
     <edit ref="edit" @editData="getData"></edit>
+    <editother ref="editother" @editData="getData"></editother>
   </div>
 </template>
 
@@ -67,12 +68,15 @@
 import {
   storeConversionPage,
   editStateStoreConversionPage,
+  editStateStoreConversions,
+  selectOne
 } from "@/api/storeManage.js";
 
 import edit from "./edit.vue";
-import { editStateStoreConversion } from "../../../../../api/storeManage";
+import editother from "../editother.vue";
+
 export default {
-  components: { edit },
+  components: { edit,editother },
   data() {
     return {
       dialogFormVisible: false,
@@ -108,8 +112,10 @@ export default {
       this.selection = selection;
     },
     quer(row) {
+      console.log("🚀 ~ file: index.vue ~ line 114 ~ quer ~ row", row)
+      
       let list = [row.id];
-      let form = { statu: 2, ids: list };
+      let form = { statu: 2, ids: list,mobilePhone:row.mobilePhone,brandNumber:row.brandNumber };
       this.confirm(form);
     },
     quers() {
@@ -118,12 +124,37 @@ export default {
         list.push(item.id);
       });
       let form = { statu: 2, ids: list };
-      this.confirm(form);
+      this.confirms(form);
     },
-    confirm(form) {
-      editStateStoreConversion(form).then((res) => {
+    confirm(row) {
+      var id = { id: row.id };
+      
+      console.log("🚀 ~ file: index.vue ~ line 129 ~ confirm ~ row", row)
+      selectOne(id)
+        .then((res) => {
+          if ((res.code = "000000")) {
+            this.$refs.editother.show(row, "修改",'转门店');
+          } else {
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        })
+        .catch((err) => {
+          //console.log(err);
+        });
+    },
+    confirms(row) {
+      editStateStoreConversions(row).then((res) => {
         if (res.code == "000000") {
           this.getData();
+          this.$message.success({
+                  message: res.message,
+                });
         } else {
           this.$alert(res.message, "提示", {
             confirmButtonText: "确定",

src/pages/storeManage/rechargeType/components/edit.vue

@@ -111,6 +111,7 @@ export default {
       rowForm: {}, //修改对象前备份
       title: "", //弹窗标题
       dialogFormVisible: false, //弹窗开关
+      
     };
   },
   methods: {

src/pages/storeManage/rechargeType/rechargeType.vue

@@ -717,15 +717,12 @@ export default {
           this.format = this.format.replace([x], obj[x]);
           // x 为键 replace[x]值，replace[x]替换成obj[x]
         }
-
         console.log(this.format);
-
         res.pageInfo.list.forEach(item => {
-          if (item.unifiedDue < this.format) {
+          if (item.unifiedDue< this.format) {
             item.state = 0;
           }
         });
-
         res.pageInfo.tableList = res.pageInfo.list;
         this.pageInfo = res.pageInfo;
       });