订单-离职交接-详情

src/views/interest/handover/addEdit.vue

@@ -65,6 +65,7 @@ export default {
   mixins: [resToken],
   data() {
     return {
+      isShowBtn: "", //是否展示按钮
       roleList: [],
       loading: false,
       title: "添加离职交接",
@@ -139,8 +140,10 @@ export default {
         await this.resetForm();
       } else {
         if (this.isDetail) {
-          // this.title = "离职交接详情";
+          this.title = "离职交接详情";
           this.rulesThis = {};
+          this.isShowBtn = !this.isDetail;
+          
         } else {
           // this.title = "修改离职交接";
           this.rulesThis = this.rules;

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

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: "添加离职交接",
+      title: "",
       showModelThis: this.showModel,
     };
   },
@@ -44,7 +44,6 @@ export default {
       this.showModelThis = val;
       if (val) {
         this.initForm();
-        console.log(val);
       }
     },
     showModelThis(val) {
@@ -59,12 +58,14 @@ export default {
     },
     async initForm() {
       this.loading = true;
-      // console.log(this.id);add
+      console.log(this.id);
       if (this.id === "add") {
         this.title = "添加离职交接";
         this.rulesThis = this.rules;
         // await this.resetForm();
       } else {
+        console.log(this.isDetail);
+
         if (this.isDetail) {
           this.title = "离职交接详情";
           this.rulesThis = {};

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

@@ -12,7 +12,7 @@
         <el-form-item label="离职人" prop="resign_uid">
           <!-- :disabled="parmValue1.type == 1" -->
           <search-account
-            :disabled="!isDetail"
+            :disabled="isDetail"
             :is-detail="isDetail"
             :value="ruleForm.resign_uid"
             :size="searchSize"
@@ -25,7 +25,7 @@
           <!-- 
              -->
           <search-account
-            :disabled="!isDetail"
+            :disabled="isDetail"
             :is-detail="isDetail"
             :value="ruleForm.hand_uid"
             :size="searchSize"
@@ -38,14 +38,16 @@
       </el-form>
     </el-col>
     <el-col :span="24" style="text-align: right">
-      <el-button type="primary" @click="submitForm">保 存 </el-button>
-      <el-button type="primary" @click="submitForm('flow')" v-if="isBtn"
+      <el-button type="primary" @click="submitForm" v-if="id === 'add'">{{
+        id === "add" ? "保 存" : "关 闭"
+      }}</el-button>
+      <!-- <el-button type="primary" @click="submitForm('flow')" v-if="isBtn"
         >保 存 并 发 起 流 程
-      </el-button>
-      <el-button @click="closeAddEdit" v-if="isBtn"
+      </el-button> -->
+      <!-- <el-button @click="closeAddEdit" v-if="isBtn"
         >取 消 审 核 流 程</el-button
-      >
-      <el-button @click="closeAdd" v-if="id === 'add'">关 闭</el-button>
+      > -->
+      <el-button @click="closeAdd"> 关 闭</el-button>
       type:{{ parmValue1 }}
     </el-col>
   </el-row>
@@ -92,9 +94,7 @@ export default {
     };
   },
   mounted() {
-    console.log(this.parmValue1);
     console.log(this.isDetail);
-    // console.log(this.id);
     this.initForm();
   },
   methods: {
@@ -104,15 +104,12 @@ export default {
       const res = await asyncRequest.delete({ id: this.parmValue1.id });
       console.log(res);
       if (res && res.code === 0) {
-        console.log(res);
-        console.log(this.ruleForm);
         window.vm.$router.push({
           path: "handover",
         });
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        console.log("sasd");
         this.$message.warning(res.message);
       }
     },
@@ -122,27 +119,26 @@ export default {
     async initForm() {
       this.loading = true;
       if (this.id === "add") {
+        console.log(this.isBtn);
+        this.isBtn = true;
         console.log("添加");
-        this.isDetail = true;
+        this.isDetail = false;
         this.rulesThis = this.rules;
         await this.resetForm();
       } else {
-        console.log(this.isBtn);
-        this.isBtn = true;
-        if (!this.isDetail) {
+        if (this.isDetail) {
           this.rulesThis = {};
+          await this.initData();
         } else {
           this.rulesThis = this.rules;
           await this.resetForm();
           await this.initData();
         }
       }
-      // await this.initData();
       this.loading = false;
     },
     async initData() {
-      // console.log(this.id);
-      const res = await asyncRequest.detail({ id: this.parmValue1.id });
+      const res = await asyncRequest.detail({ id: this.id });
       if (res && res.code === 0 && res.data) {
         let { hand_name, resign_name, hand_uid, resign_uid, id, status } =
           res.data;
@@ -154,7 +150,6 @@ export default {
           type: status,
           id,
         };
-        console.log(this.ruleForm.type);
         // this.$emit("refreshList");
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -178,7 +173,6 @@ export default {
       });
     },
     async submitForm(flow) {
-      console.log(this.ruleForm);
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           let resign_uid = this.ruleForm.resign_uid;
@@ -190,17 +184,13 @@ export default {
               resign_uid: resign_uid.toString(),
               hand_uid: hand_uid.toString(),
             };
-            console.log(model);
-            console.log(this.id);
             let res = {};
             if (this.id === "add") {
               delete model["id"];
               res = await asyncRequest.add(model);
-              console.log(res);
             } else {
               res = await asyncRequest.update(model);
               if (flow == "flow") {
-                console.log("状态更新接口");
                 this.updateStatus();
               }
             }
@@ -232,7 +222,6 @@ export default {
       });
     },
     async updateStatus() {
-      console.log(this.ruleForm);
       let { id, type } = this.ruleForm;
       let model = {
         id: id,
@@ -265,7 +254,6 @@ export default {
       this.$refs.ruleForm.validateField("resign_uid");
     },
     handleHandoverName(e) {
-      // console.log(e);
       if (e && e.id) {
         this.ruleForm.hand_uid = [e.id];
       } else {
@@ -278,6 +266,4 @@ export default {
 </script>
 
    <style lang="scss" scoped>
-.account {
-}
 </style>

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

@@ -1,238 +0,0 @@
-<template>
-  <el-row :gutter="10" :loading="loading">
-    <el-col :span="24">
-      <el-form
-        ref="ruleForm"
-        :model="ruleForm"
-        status-icon
-        :rules="rules"
-        label-width="100px"
-        class="demo-ruleForm"
-      >
-        <el-form-item label="离职人" prop="resign_name">
-          <search-account
-            :value="ruleForm.resign_uid"
-            :size="searchSize"
-            :names="ruleForm.resign_name"
-            :is-detail="isDetail"
-            :disabled="!isDetail"
-            :placeholder="'离职人名称'"
-            @searchChange="handleResignName"
-          />
-        </el-form-item>
-        <el-form-item label="接受人" prop="hand_name">
-          <search-account
-            :value="ruleForm.hand_uid"
-            :size="searchSize"
-            :names="ruleForm.hand_name"
-            :is-detail="isDetail"
-            :disabled="!isDetail"
-            :placeholder="'接受人名称'"
-            @searchChange="handleHandoverName"
-          />
-        </el-form-item>
-        12{{ edit_form }}
-      </el-form>
-    </el-col>
-    <el-col :span="24" style="text-align: right">
-      <el-button v-if="isDetail" type="primary" @click="submitForm"
-        >保 存
-      </el-button>
-
-      <el-button v-if="isDetail" type="primary" @click="submitForm12"
-        >保 存 并 发 起 流 程
-      </el-button>
-      <el-button @click="closeAddEdit" v-if="isDetail">{{
-        isDetail ? "关 闭" : "取 消"
-      }}</el-button>
-    </el-col>
-  </el-row>
-</template>
-<script>
-import asyncRequest from "@/apis/service/interest/handover";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "handover",
-  props: ["id", "isDetail", "showModelThis", "edit_form"],
-  mixins: [resToken],
-  data() {
-    return {
-      parmValue: "parmValue",
-      roleList: [],
-      loading: false,
-      showModelThis: this.showModel,
-      resign_name: "", //离职人
-      hand_name: "", //交接人
-      ruleForm: {
-        hand_uid: [],
-        resign_uid: [],
-      },
-      rulesThis: this.rules,
-      rules: {
-        resign_uid: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择离职人",
-            trigger: "change",
-          },
-        ],
-        hand_uid: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择接受人",
-            trigger: "change",
-          },
-        ],
-      },
-    };
-  },
-  mounted() {
-    this.initForm();
-    console.log(this.ruleForm);
-    console.log(this.parmValue1);
-  },
-  // watch: {
-  //   parmValue: function (newV, oldV) {
-  //     console.log(newV);
-  //     console.log(oldV);
-  //   },
-  // },
-  methods: {
-    //   关闭弹窗,直接隐藏表单
-    closeAddEdit() {
-      this.isShowForm = false;
-      this.$emit("closeModel", false); //抛出一个事件，关闭弹窗
-    },
-
-    async initForm() {
-      this.loading = true;
-      // if (this.id === "add") {
-      //   // this.title = "添加离职交接";
-      //   this.rulesThis = this.rules;
-      //   await this.resetForm();
-      // } else {
-      //   if (this.isDetail) {
-      //     this.rulesThis = {};
-      //   }
-      //   await this.resetForm();
-      //   await this.initData();
-      // }
-      console.log("initform");
-      if (this.isDetail) {
-        this.rulesThis = {};
-      }
-      await this.resetForm();
-      await this.initData();
-      this.loading = false;
-    },
-    async initData() {
-      console.log(this.parmValue1);
-      const res = await asyncRequest.detail({ id: this.edit_form.id });
-      if (res && res.code === 0 && res.data) {
-        console.log(res);
-        let { hand_name, resign_name, hand_uid, resign_uid } = res.data;
-        this.ruleForm = {
-          resign_name,
-          hand_name,
-          hand_uid: hand_uid.split(","),
-          resign_uid: resign_uid.split(","),
-        };
-        console.log(this.ruleForm);
-        this.$emit("refreshList");
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.ruleForm = {
-            resign_name: "", //离职人
-            hand_name: "", //交接人
-            hand_uid: [],
-            resign_uid: [],
-          };
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        console.log(valid);
-        if (valid) {
-          let resign_name1 = this.ruleForm.resign_uid;
-          let hand_name1 = this.ruleForm.hand_uid;
-          if (resign_name1.toString() !== hand_name1.toString()) {
-            this.loading = true;
-            const model = {
-              id: this.id,
-              resign_uid: resign_name1.toString(),
-              hand_uid: hand_name1.toString(),
-            };
-            let res = {};
-            // if (this.id === "add") {
-            //   delete model["id"];
-            //   res = await asyncRequest.add(model);
-            //   console.log(res);
-            // } else {
-            res = await asyncRequest.update(model);
-            // }
-            console.log(res);
-            this.loading = false;
-            if (res && res.code === 0) {
-              const title = this.id === "add" ? "添加成功！" : "修改成功！";
-              this.$notify.success({
-                title,
-                message: "",
-              });
-              this.showModelThis = false;
-              // 刷新
-              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("12");
-
-            this.$message.error("离职人和接收人不能相同");
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-
-    handleResignName(e) {
-      if (e && e.id) {
-        this.ruleForm.resign_uid = [e.id];
-      } else {
-        this.ruleForm.resign_uid = [];
-      }
-      // this.$refs.ruleForm.validateField("resign_uid");
-    },
-    handleHandoverName(e) {
-      console.log(e);
-      if (e && e.id) {
-        this.ruleForm.hand_uid = [e.id];
-      } else {
-        this.ruleForm.hand_uid = [];
-      }
-      // this.$refs.ruleForm.validateField("hand_uid");
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.account {
-}
-</style>

src/views/interest/handover/index.vue

@@ -13,7 +13,6 @@
         :columns="columns"
         :page="pageInfo"
         :size="size"
-        @RowClick="RowClick"
         @page-curr-change="handlePageChange"
         @page-size-change="handleSizeChange"
         @screen-reset="
@@ -82,7 +81,7 @@
                     :size="searchSize"
                     type="success"
                     style="float: right"
-                    @click="openModal('add', '003')"
+                    @click="openModal('add', false)"
                   >
                     新建
                   </el-button>
@@ -126,6 +125,19 @@
             "
           ></el-tag>
         </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((item) => item == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="showDetail(scope.row.id, true, scope.row)"
+            ></i>
+          </el-tooltip>
+        </template>
       </ex-table>
       <add-edit
         :id="modelId"
@@ -242,6 +254,13 @@ export default {
           label: "创建时间",
           sortable: true,
         },
+        {
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          _slot_: "operation",
+        },
       ],
     };
   },
@@ -250,13 +269,17 @@ export default {
   },
   methods: {
     // 表格行选中的方法
-    RowClick(e) {
-      window.vm.$router.push({
-        path: "newProcess",
-        query: {
-          id: e.id,
-        },
-      });
+    // RowClick(e) {
+    //   window.vm.$router.push({
+    //     path: "newProcess",
+    //     query: {
+    //       id: e.id,
+    //     },
+    //   });
+    // },
+    showDetail(id, isDetail, sitem) {
+      console.log(isDetail);
+      this.openModal(id, isDetail);
     },
     restSearch() {
       this.parmValue = {
@@ -273,10 +296,10 @@ export default {
       };
       this.searchList();
     },
-    openModal(id, detailCode) {
+    openModal(id, detail) {
       this.showModel = true;
       this.modelId = id;
-      this.isDetail = detailCode === "007";
+      this.isDetail = detail;
     },
     // 获取离职交接列表
     async searchList() {

src/views/purchaseIn/storeGoods/addEdit.vue

@@ -1,362 +0,0 @@
-<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/purchaseIn/storeGoods";
-import resToken from "@/mixins/resToken";
-import {
-  isnumber,
-  isMobile,
-  validEmail,
-  isAlphanumeric,
-  isChinese,
-  isEmoticon,
-  validAlphabets,
-} from "@/utils/validate";
-export default {
-  name: "storeGoods",
-  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>
-.storeGoods {
-}
-</style>
-   

src/views/purchaseIn/storeGoods/index.vue

@@ -31,7 +31,8 @@
                   <search-supplier
                     :placeholder="'供应商名称'"
                     :size="searchSize"
-                    :value="parmValue.gys_code"
+                    :value="parmValue.supplierNo"
+                    :names="parmValue.gys_names"
                     @searchChange="handleValue"
                   />
                 </el-col>
@@ -146,15 +147,12 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/purchaseIn/storeGoods";
-import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 
 export default {
   name: "storeGoods",
   mixins: [mixinPage, resToken],
-  components: {
-    addEdit,
-  },
+
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -172,7 +170,6 @@ export default {
   data() {
     return {
       wsmcode: "",
-      gys_code: "", //供应商编码
       product_code: "", //商品编码
       product_name: "", //商品名称
       product: "", //商品名称绑定的数据
@@ -188,6 +185,8 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        gys_names: "", //供应商名称
+
         wsmcode: "", //仓库编码
         type_code: "", //仓库属性code
         good_code: "", //商品编码
@@ -296,7 +295,6 @@ export default {
   },
   mounted() {
     this.restSearch();
-    // this.searchList();
   },
 
   methods: {
@@ -309,51 +307,22 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
-      console.log(this.parmValue);
       this.searchList();
     },
-
-    openModal(id, isDetail, sitem) {
-      this.showModel = true;
-      this.modelId = id;
-      this.isDetail = isDetail;
-      this.sitem = sitem;
-    },
-    // 删除功能函数
-    async deleteById(id, status) {
-      // await this.$confirm("确定要删除？", {
-      //   confirmButtonText: "确定",
-      //   cancelButtonText: "取消",
-      //   type: "warning",
-      // })
-      //   .then(async () => {
-      //     const model = {
-      //       id: id,
-      //       status: status === "1" ? "0" : "1",
-      //     };
-      //     const res = await asyncRequest.status(model);
-      //     if (res && res.code === 0) {
-      //       this.$notify.success({
-      //         title: "删除成功",
-      //         message: "",
-      //       });
-      //       this.searchList();
-      //     } else if (res && res.code >= 100 && res.code <= 104) {
-      //       await this.logout();
-      //     } else {
-      //       this.$message.warning(res.message);
-      //     }
-      //   })
-      //   .catch(() => {
-      //     console.log("取消");
-      //   });
-    },
     // 获取商品列表功能函数
     async searchList() {
       this.loading = true;
-
-      console.log(this.parmValue);
-      const res = await asyncRequest.list(this.parmValue);
+      let { good_code, good_name, page, size, supplierNo, wsmcode } =
+        this.parmValue;
+      let model = {
+        good_code,
+        good_name,
+        page,
+        size,
+        supplierNo: supplierNo.toString(),
+        wsmcode,
+      };
+      const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         res.data.list.forEach((element) => {
           element.classArr = `${element.sort_f}/${element.sort_s}${element.sort_t}`;
@@ -384,9 +353,7 @@ export default {
             id: id,
             status: status === "1" ? "0" : "1",
           };
-          // console.log(model);
           const res = await asyncRequest.status(model);
-          // console.log(res);
           if (res && res.code === 0) {
             this.loading = false;
             this.$notify.success({
@@ -407,23 +374,23 @@ export default {
     handleValue(e) {
       console.log(e);
       if (e && e.id) {
-        this.parmValue.supplierNo = e.code;
+        this.parmValue.supplierNo = [e.code];
+        this.parmValue.gys_names = e.label;
         console.log(this.parmValue);
       } else {
         this.parmValue.supplierNo = [];
-      }
-      // this.$refs.ruleForm.validateField("supplierNo");
-    },
-    handleStock(e) {
-      console.log(e);
-      // this.parmValue.wsmcode = e.code;
-      if (e && e.id) {
-        this.parmValue.wsmcode = e.code;
-        console.log(this.parmValue);
-      } else {
-        this.parmValue.wsmcode = [];
+        this.parmValue.gys_names = "";
       }
     },
+    // handleStock(e) {
+    //   console.log(e);
+    //   if (e && e.id) {
+    //     this.parmValue.wsmcode = [e.code];
+    //     console.log(this.parmValue);
+    //   } else {
+    //     this.parmValue.wsmcode = [];
+    //   }
+    // },
   },
 };
 </script>

src/views/purchaseIn/storeManage/addEdit.vue

@@ -61,7 +61,7 @@
               <search-stock
                 :value="ruleForm.stock_code"
                 :isDetail="true"
-                :placeholder="'请选择盘点仓库'"
+                :placeholder="'请选择备库仓库'"
                 :isRelation="true"
                 :companyCode="companyCode"
                 :names="''"

src/views/purchaseIn/storeManage/addModel.vue

@@ -0,0 +1,60 @@
+<template>
+  <el-dialog
+    title="新建备货申请"
+    :center="true"
+    align="left"
+    top="18vh"
+    width="600px"
+    @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)"
+    append-to-body
+  >
+    <el-card style="margin-top: -20px">
+      <add-edit v-if="showModelThis" :id="id" @closeModel="closeModel" />
+    </el-card>
+  </el-dialog>
+</template>
+   <script>
+import addEdit from "./components/addEdit.vue";
+export default {
+  name: "addModel",
+  props: ["showModel", "id"],
+  components: {
+    addEdit,
+  },
+  data() {
+    return {
+      formId: "",
+      loading: false,
+      showModelThis: this.showModel,
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+  methods: {
+    closeModel() {
+      this.showModelThis = false;
+      // console.log("closeModel!!");
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+.check {
+}
+</style>
+   

src/views/purchaseIn/storeManage/components/addEdit.vue

@@ -0,0 +1,346 @@
+<template>
+  <div>
+    <el-form
+      :model="ruleForm"
+      :rules="rulesThis"
+      status-icon
+      ref="ruleForm"
+      label-width="80px"
+      class="demo-ruleForm"
+    >
+      <el-row>
+        <!-- 商品名称 -->
+        <el-col :span="24">
+          <el-form-item label="商品名称" prop="goods_name">
+            <el-input
+              v-model="ruleForm.goods_name"
+              readonly="true"
+              @focus="hand"
+            ></el-input>
+            <!-- <search-good-modal /> -->
+          </el-form-item>
+        </el-col>
+        <!-- 采购数量 -->
+        <el-col :span="24">
+          <el-form-item label="采购数量" prop="goods_num">
+            <el-input
+              v-model="ruleForm.goods_num"
+              placeholder="请输入内容"
+              :size="searchSize"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <!-- 最晚入库时间 -->
+        <el-col :span="24">
+          <el-form-item label="最晚入库时间" prop="last_go_stock">
+            <el-date-picker
+              :size="searchSize"
+              v-model="ruleForm.last_go_stock"
+              type="date"
+              style="width: 100%"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              :picker-options="pickerOptions"
+              @change="selectTime"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <!-- 供应商选择 -->
+        <el-col :span="24">
+          <el-form-item label="供应商名称" prop="supplier_code">
+            <search-supplier
+              :value="ruleForm.supplier_code"
+              :placeholder="'请选择供应商'"
+              @searchChange="selectSupplier"
+            />
+          </el-form-item>
+        </el-col>
+        <!-- 仓库名称 -->
+        <el-col :span="24">
+          <el-form-item label="仓库名称" prop="stock_code">
+            <search-stock
+              :value="ruleForm.stock_code"
+              :isDetail="true"
+              :placeholder="'请选择备库仓库'"
+              :isRelation="true"
+              :companyCode="companyCode"
+              @searchChange="selectStock"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :span="24" style="text-align: right">
+          <el-button type="primary" @click="submitForm" v-if="!isDetail"
+            >保 存
+          </el-button>
+        </el-col> -->
+        <el-col :span="24" style="text-align: right">
+          <el-button type="primary" @click="submitForm" v-if="!isDetail"
+            >保 存
+          </el-button>
+          <el-button @click="closeModel">{{
+            isDetail ? "关 闭" : "取 消"
+          }}</el-button>
+          id:{{ id }} isDetail:{{ isDetail }}showModel::{{ showModelThis }}
+        </el-col>
+      </el-row>
+    </el-form>
+    <search-good-modal
+      :once="true"
+      :show-model="showGoodsModel"
+      @cancel="showGoodsModel = false"
+      @resultList="addGoodsRes"
+    />
+  </div>
+</template>
+   <script>
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/storeManage";
+export default {
+  name: "storeManage",
+  props: ["showModel", "id", "isDetail"],
+  mixins: [resToken],
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+      stockCode: "",
+      companyCode: "",
+      showGoodsModel: "", //打开新弹窗
+      loading: false,
+      title: "新建备货申请",
+      showModelThis: this.showModel,
+      ruleForm: {
+        good_code: "",
+        good_type_code: "",
+        goods_name: "", //商品名称
+        goods_num: "", //商品数量
+        last_go_stock: "", //最晚入库时间
+        supplier_code: [], //供应商名称
+        stock_code: [],
+      },
+      rulesThis: this.rules,
+      rules: {
+        //出入库规则
+        goods_name: [
+          {
+            required: true,
+            message: "商品名称不能为空",
+            trigger: "blur",
+          },
+        ],
+        goods_num: [
+          {
+            required: true,
+            message: "请选择入库仓库",
+            trigger: "blur",
+          },
+        ],
+        last_go_stock: [
+          {
+            // type: "date",
+            required: true,
+            message: "请输入入库最晚时间",
+            // trigger: "blur" ,
+            trigger: ["blur", "change"],
+          },
+        ],
+        supplier_code: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择供应商",
+            trigger: "change",
+          },
+        ],
+        stock_code: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择仓库",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        this.initForm();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+  methods: {
+    // 选择仓库
+    selectStock(e) {
+      console.log(e);
+      if (e && e.id) {
+        this.ruleForm.stock_code = [e.code];
+        this.stockCode = e.code;
+      } else {
+        this.ruleForm.stockCode = [];
+        this.stockCode = "";
+      }
+      console.log(this.ruleForm);
+      this.$refs.ruleForm.validateField("stock_code");
+    },
+    // 选择供应商
+    selectSupplier(e) {
+      console.log(e);
+      console.log(this.ruleForm);
+      if (e && e.id) {
+        this.ruleForm.supplier_code = [e.code];
+        this.companyCode = e.code;
+      } else {
+        this.ruleForm.supplier_code = [];
+        this.companyCode = "";
+      }
+      this.$refs.ruleForm.validateField("supplier_code");
+    },
+    // 执行点击商品名称的抛出事件
+    addGoodsRes(e) {
+      console.log(e);
+      let { good_code, good_name, type_code } = e[0];
+      this.ruleForm.goods_name = good_name;
+      this.ruleForm.good_type_code = type_code;
+      this.ruleForm.good_code = good_code;
+      this.$refs.ruleForm.validateField("goods_name");
+    },
+    hand() {
+      this.showGoodsModel = true;
+    },
+    // 最晚入库时间选择
+    selectTime(e) {
+      console.log(e);
+      this.ruleForm.last_go_stock = e;
+    },
+    closeModel() {
+      console.log("closeModel!!");
+      this.$emit("closeModel");
+    },
+    async initForm() {
+      this.loading = true;
+      // await this.getRole();
+      if (this.id === "add") {
+        this.rulesThis = this.rules;
+        await this.resetForm();
+      } else {
+        if (this.isDetail) {
+          this.rulesThis = {};
+        } else {
+          this.rulesThis = this.rules;
+        }
+        await this.resetForm();
+        // await this.initData()
+      }
+      this.loading = false;
+    },
+    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() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = {
+            stock_code: [],
+            supplier_code: [],
+            good_code: "",
+            good_type_code: "",
+            goods_name: "", //商品名称
+            goods_num: "100", //商品数量
+            last_go_stock: "", //最晚入库时间
+            stock_in_rule: "WSMcmpk211008104949", //入库仓库
+          };
+          if (this.id === "add" || this.isDetail) {
+            // this.rules.username[0].required = false;
+            console.log("当前是add或者 this.isDetail是true");
+          }
+        }
+      });
+    },
+
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          // if
+          console.log(this.ruleForm);
+          // const { username, name, mobile, email, role_id, status } = JSON.parse(
+          //
+          // );
+
+          const {
+            stock_code, //仓库编码
+            good_code,
+            good_type_code,
+            last_go_stock,
+            stock_in_rule,
+            goods_num,
+          } = this.ruleForm;
+          const model = {
+            good_code: good_code || "",
+            good_type_code: good_type_code || "",
+            good_num: goods_num || "",
+            wsm_code: stock_code.toString() || "",
+            lastime: last_go_stock || "",
+          };
+          console.log(model);
+          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.showModel = true;
+            // 刷新
+            this.$emit("closeModel");
+          } 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>
+.check {
+}
+</style>
+   

src/views/purchaseIn/storeManage/detail.vue

@@ -0,0 +1,223 @@
+<template>
+  <div class="checkDetail pagePadding">
+    <div
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+    >
+      <add-edit :id="$route.query.id" />
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+   <script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import statusList from "@/assets/js/statusList";
+import asyncRequest from "@/apis/service/stock/check/detail";
+import addEdit from "./components/addEdit";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "checkDetail",
+  mixins: [mixinPage, resToken],
+  components: {
+    addEdit,
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "checkDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      sitem: null,
+      // 状态
+      statusOptions: [
+        { id: "0", label: "禁用" },
+        { id: "1", label: "启用" },
+      ],
+      statusList: statusList,
+      loading: true,
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      parmValue: {
+        name: "", // 业务员名字
+        username: "", // 账号
+        status: "", //
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: [
+        {
+          prop: "nickname",
+          label: "真实姓名",
+        },
+        {
+          prop: "role_name",
+          label: "角色名称",
+        },
+        {
+          prop: "mobile",
+          label: "联系电话",
+        },
+        {
+          prop: "email",
+          label: "邮箱",
+        },
+        {
+          prop: "status",
+          label: "状态",
+          _slot_: "status",
+          width: "80px",
+        },
+        {
+          prop: "addtime",
+          label: "创建时间",
+          sortable: true,
+        },
+        {
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          _slot_: "operation",
+        },
+      ],
+    };
+  },
+  mounted() {
+    console.log(this.$route.query.id);
+
+    // this.searchList();
+  },
+
+  methods: {
+    restSearch() {
+      this.parmValue = {
+        name: "", // 业务员名字
+        username: "", // 账号
+        status: "", //
+        page: 1, // 页码
+        size: 10, // 每页显示条数
+      };
+      this.searchList();
+    },
+
+    openModal(id, isDetail, sitem) {
+      this.showModel = true;
+      this.modelId = id;
+      this.isDetail = isDetail;
+      this.sitem = sitem;
+    },
+    async deleteById(id, status) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: id,
+            status: status === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.list(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    async statusConfirm(id, status) {
+      let str = status === "1" ? "禁用" : "启用";
+      await this.$confirm("确定要改为" + str + "?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            id: id,
+            status: status === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "状态修改成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.checkDetail {
+}
+</style>
+   

src/views/purchaseIn/storeManage/index.vue

@@ -10,7 +10,6 @@
         :columns="columns"
         :page="pageInfo"
         :size="size"
-        @RowClick="RowClick"
         @page-curr-change="handlePageChange"
         @page-size-change="handleSizeChange"
         @screen-reset="
@@ -113,18 +112,6 @@
           ></el-tag>
         </template>
         <template #operation="{ scope }">
-          <el-tooltip
-            v-if="powers.some((item) => item == '002')"
-            effect="dark"
-            content="重置密码"
-            placement="top"
-          >
-            <i
-              class="el-icon-refresh-left tb-icon"
-              @click="openPasswordModal(scope.row.id, false)"
-            ></i>
-          </el-tooltip>
-
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
             effect="dark"
@@ -133,44 +120,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="openModal(scope.row.id, true, scope.row)"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            v-if="powers.some((item) => item == '005')"
-            effect="dark"
-            content="修改"
-            placement="top"
-          >
-            <i
-              class="el-icon-edit tb-icon"
-              @click="openModal(scope.row.id, false, scope.row)"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            v-if="
-              powers.some((item) => item == '004') && scope.row.status === '1'
-            "
-            effect="dark"
-            content="禁用"
-            placement="top"
-          >
-            <i
-              class="el-icon-video-pause tb-icon"
-              @click="statusConfirm(scope.row.id, scope.row.status)"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            v-if="
-              powers.some((item) => item == '004') && scope.row.status === '0'
-            "
-            effect="dark"
-            content="启用"
-            placement="top"
-          >
-            <i
-              class="el-icon-video-play tb-icon"
-              @click="statusConfirm(scope.row.id, scope.row.status)"
+              @click="showDetail(scope.row.id, true, scope.row)"
             ></i>
           </el-tooltip>
         </template>
@@ -194,7 +144,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/purchaseIn/storeManage";
-import addEdit from "./addEdit";
+import addEdit from "./addModel.vue";
 import { mapGetters } from "vuex";
 
 export default {
@@ -204,7 +154,7 @@ export default {
     addEdit,
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "visitedViews"]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(
@@ -222,8 +172,8 @@ export default {
       sitem: null,
       // 状态
       statusOptions: [
-        { id: "0", label: "禁用" },
-        { id: "1", label: "启用" },
+        { id: "0", label: "后端未定" },
+        { id: "1", label: "后端未定义" },
       ],
       statusList: statusList,
       loading: true,
@@ -231,9 +181,6 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        name: "", // 业务员名字
-        username: "", // 账号
-        status: "", //
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -273,10 +220,6 @@ export default {
           prop: "good_type_code",
           label: "商品属性",
         },
-        // {
-        //   prop: "unit",
-        //   label: "单位",
-        // },
         {
           prop: "good_num",
           label: "数量",
@@ -296,13 +239,14 @@ export default {
           label: "创建时间",
           sortable: true,
         },
-        // {
-        //   prop: "",
-        //   label: "操作",
-        //   fixed: "right",
-        //   _noset_: true,
-        //   _slot_: "operation",
-        // },
+        {
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          width: "50px",
+          _slot_: "operation",
+        },
       ],
     };
   },
@@ -312,18 +256,16 @@ export default {
 
   methods: {
     // 点击行操作
-    RowClick(e) {
-      // console.log(e);
+    async showDetail(id, isDetail, sitem) {},
+
+    gotoDetail(path, id) {
       window.vm.$router.push({
-        path: "storeManageFlow",
+        path: path,
         query: {
-          id: e.id,
+          id: id,
         },
       });
     },
-
-    //跳转到新建页面
-
     handleClick() {
       console.log("采购反馈");
       window.vm.$router.push({
@@ -333,9 +275,6 @@ export default {
 
     restSearch() {
       this.parmValue = {
-        name: "", // 业务员名字
-        username: "", // 账号
-        status: "", //
         page: 1, // 页码
         size: 10, // 每页显示条数
       };