Merge branch 'live' into edit

src/views/interest/organize/index copy.vue

@@ -1,625 +0,0 @@
-<template>
-  <div class="organize pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
-      <el-row :gutter="10">
-        <!-- v-loading="loading" -->
-        <el-col
-          :span="24"
-          v-loading="loading"
-          v-if="
-            powers && powers.length > 0 && powers.some((item) => item == '001')
-          "
-        >
-          <shy-tree
-            :value="tableData"
-            :level="1"
-            @addEdit="addEditFn"
-            @openChildren="openChildren"
-            @editInterface="editInterface"
-            @remove="remove"
-            @del="del"
-          />
-        </el-col>
-      </el-row>
-      <!-- <ex-table
-        v-loading="loading"
-        v-if="
-          powers && powers.length > 0 && powers.some((item) => item == '001')
-        "
-        :table="table"
-        :data="tableData"
-        :columns="columns"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-      >
-        <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-              <el-col :span="24">
-                <el-col :span="4" style="width: 120px">
-                  <el-select
-                    :size="searchSize"
-                    v-model="parmValue.status"
-                    filterable
-                    clearable
-                    placeholder="账号状态"
-                    style="width: 100%"
-                    @change="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                  >
-                    <el-option
-                      v-for="item in statusList"
-                      :key="'status' + item.code"
-                      :label="item.name"
-                      :value="item.code"
-                    />
-                  </el-select>
-                </el-col>
-                <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
-                  <el-input
-                    :size="searchSize"
-                    v-model="parmValue.name"
-                    :maxlength="40"
-                    placeholder="业务员姓名"
-                  />
-                </el-col>
-                <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
-                  <el-input
-                    :size="searchSize"
-                    v-model="parmValue.username"
-                    :maxlength="40"
-                    placeholder="手机号"
-                  />
-                </el-col>
-                <el-col :span="4" style="width: 54px">
-                  <el-button
-                    :size="searchSize"
-                    type="primary"
-                    class="fr"
-                    icon="el-icon-search"
-                    @click="searchList"
-                /></el-col>
-                <el-col
-                  :span="4"
-                  style="width: 66px"
-                >
-                  <el-button
-                    type="warning"
-                    class="fr"
-                    :size="searchSize"
-                    @click="restSearch"
-                  >
-                    重置
-                  </el-button>
-                </el-col>
-                <el-col
-                  :span="3"
-                  style="width: 66px; float: right"
-                >
-                  <el-button
-                    :size="searchSize"
-                    type="primary"
-                    style="float: right; margin-left: 5px"
-                    @click="searchList"
-                  >
-                    刷新
-                  </el-button>
-                </el-col>
-                      <el-col
-                :span="3"
-                style="width: 66px; float: right"
-                v-if="powers.some((item) => item == '003')"
-              >
-                <el-button
-                  :size="searchSize"
-                  type="success"
-                  style="float: right"
-                  @click="openModal('add', false)"
-                >
-                  添加
-                </el-button>
-              </el-col>
-              </el-col>
-            </el-row>
-          </div>
-        </template>
-        <template #status="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
-            "
-          ></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="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)"
-            ></i>
-          </el-tooltip>
-        </template>
-      </ex-table> -->
-      <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>
-    </div>
-  </div>
-</template>
-<script>
-import mixinPage from "@/mixins/elPaginationHandle";
-import asyncRequest from "@/apis/service/interest/organize";
-import addEdit from "./addEdit";
-import statusList from "@/assets/js/statusList";
-import { mapGetters } from "vuex";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "organize",
-  components: {
-    addEdit,
-  },
-  mixins: [mixinPage, resToken],
-  computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "organize"
-        ) || {};
-      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() {
-    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;
-    },
-    openPasswordModal(id, isDetail) {
-      this.passwordModel = true;
-      this.passwordModelId = id;
-      this.isPasswordDetail = isDetail;
-    },
-    addEditFn(id, parentIds, level, isDetail, isAdd, formData) {
-      console.log(id, parentIds, level);
-      this.showModel = true;
-      this.modelId = id;
-      this.level = level;
-      this.parentIds = parentIds;
-      this.isDetail = isDetail;
-      this.isAdd = isAdd;
-      this.formData = formData;
-    },
-    submitRefresh(id, parentIds, level) {
-      console.log(
-        `openChildren-id, parentIds, level:${id}-${parentIds}-${level}`
-      );
-      if (level < 3) {
-        this.restSearch();
-      }
-      // else if (level === 2) {
-      //   // this.parmValue.parentId = id;
-      //   this.concatData(id, parentIds, level);
-      // }
-      else {
-        this.getchildList(parentIds);
-      }
-    },
-    async remove(id, parentIds, level, status) {
-      // console.log(
-      //   `openChildren-id, parentIds, level:${id}-${parentIds}-${level}-${status}`
-      // );
-      await this.$confirm(`确定要${status === "0" ? "启用" : "禁用"}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const model = {
-            id: id,
-            status: status === "1" ? "0" : "1",
-          };
-          let res = {};
-          if (level === 3) {
-            res = await asyncRequest.actionstatus(model);
-          } else {
-            res = await asyncRequest.menustatus(model);
-          }
-
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "修改成功！",
-              message: "",
-            });
-            if (level === 3) {
-              this.getchildList(parentIds);
-            } else {
-              this.restSearch();
-            }
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-
-    async del(id, parentIds, level, status) {
-      console.log(
-        `openChildren-id, parentIds, level:${id}-${parentIds}-${level}-${status}`
-      );
-      await this.$confirm(`确定要删除？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const model = {
-            id: id,
-          };
-          let res = {};
-          if (level === 3) {
-            res = await asyncRequest.actiondel(model);
-          } else {
-            res = await asyncRequest.menudel(model);
-          }
-
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "删除成功！",
-              message: "",
-            });
-            if (level === 3) {
-              this.getchildList(parentIds);
-            } else {
-              this.restSearch();
-            }
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-
-    openChildren(id, parentIds, level, isOpen) {
-      if (isOpen) {
-        // console.log(
-        //   `openChildren-id, parentIds, level:${id}-${parentIds}-${level}`
-        // );
-        if (level === 1) {
-          this.tableData = this.tableData.map((v) => {
-            if (v.id === id) {
-              v.child = [];
-            }
-            return v;
-          });
-        } else {
-          this.tableData = this.tableData.map((v) => {
-            if (v.id === parentIds) {
-              v.child = v.child.map((val) => {
-                if (val.id === id) val.child = [];
-                return val;
-              });
-            }
-            return v;
-          });
-        }
-      } else {
-        if (level === 1) {
-          this.concatData(id, "0", level);
-        } else {
-          this.getchildList(id);
-        }
-      }
-    },
-    async getchildList(id) {
-      this.loading = true;
-      const res = await asyncRequest.actionList({ id: id });
-      let tableData = [];
-      if (res && res.code === 0 && res.data) {
-        tableData = res.data;
-        // tableData = tableData.map((val) => {
-        //   let index = btnList.findIndex((e) => val.action_code === e.code);
-        //   if (index !== -1) {
-        //     val.menu_name = btnList[index].name;
-        //   }
-        //   return val;
-        // });
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-      let arr = JSON.parse(JSON.stringify(this.tableData));
-      arr = arr.map((val, index) => {
-        if (val && val.child && val.child.length > 0) {
-          val.child.forEach((el, eli) => {
-            if (id === el.id) {
-              //  console.log(el);
-              el.child = tableData;
-            }
-            return el;
-          });
-        }
-        return val;
-      });
-      this.tableData = arr;
-      this.loading = false;
-    },
-    async concatData(id, parentIds, level) {
-      console.log(id, parentIds, level);
-      this.loading = true;
-      const res = await asyncRequest.list({});
-      let tableData = [];
-      if (res && res.code === 0 && res.data) {
-        tableData = res.data;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-      let arr = JSON.parse(JSON.stringify(this.tableData));
-      // if (level === 1) {
-      arr = arr.map((val, index) => {
-        if (level === 1 ? id : parentIds === val.id) {
-          val.child = tableData[index].child;
-        }
-        return val;
-      });
-
-      this.tableData = arr;
-      this.loading = false;
-    },
-    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) {
-      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
-        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>
-.organize {
-}
-</style>

src/views/purchaseIn/storeAnomaly/index.vue

@@ -125,14 +125,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/purchaseIn/storeGoods/index.vue

@@ -139,14 +139,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/report/index.vue

@@ -140,7 +140,7 @@
       :isDetail="isDetail"
       @refresh="searchList"
       @cancel="showModel = false"
-    ></add-edit>
+    />
   </div>
 </template>
    <script>

src/views/sellOut/goodsAnomaly/index.vue

@@ -123,14 +123,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/sellOut/goodsBack/index.vue

@@ -123,14 +123,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/allot/index.vue

@@ -142,14 +142,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/check/index.vue

@@ -188,14 +188,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/dataWeido/index.vue

@@ -231,14 +231,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/my-test/index.vue

@@ -182,14 +182,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/productWeido/index.vue

@@ -232,14 +232,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/spaceCount/index.vue

@@ -151,14 +151,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/stockCount/index.vue

@@ -29,14 +29,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/stockWarning/index.vue

@@ -157,14 +157,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-
-    <add-edit
-      :showModel="showModel"
-      :row="row"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/stock/survey/index.vue

@@ -77,13 +77,6 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
-    <add-edit
-      :showModel="showModel"
-      :id="modelId"
-      :isDetail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    ></add-edit>
   </div>
 </template>
    <script>

src/views/system/parameter/index.vue

@@ -132,11 +132,11 @@
           </template>
         </el-table-column>
       </el-table>
-       <add-edit
+      <add-edit
         :showModel="showModel"
         :id="modelId"
         @cancel="showModel = false"
-      ></add-edit>
+      />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -150,10 +150,10 @@ import addEdit from "./addEdit";
 import resToken from "@/mixins/resToken";
 export default {
   name: "Parameter",
-   components: {
+  components: {
     addEdit,
   },
-  mixins:[resToken],
+  mixins: [resToken],
   computed: {
     powers() {
       let tran =
@@ -178,9 +178,9 @@ export default {
           return time.getTime() <= date;
         },
       },
-      showModel:false,
+      showModel: false,
       loading: false,
-      modelId:0,
+      modelId: 0,
       tableData: [],
     };
   },
@@ -191,23 +191,23 @@ export default {
     async onSubmit(row) {
       if (!this.loading) {
         this.loading = true;
-        const obj={
-          fields_name:row.field_name,
-          value:row.values,
-          expiretime:row.expiretime,
-          fields:row.fields
-        }
-       obj.expiretime = parseTime(new Date(obj.expiretime).valueOf());
+        const obj = {
+          fields_name: row.field_name,
+          value: row.values,
+          expiretime: row.expiretime,
+          fields: row.fields,
+        };
+        obj.expiretime = parseTime(new Date(obj.expiretime).valueOf());
         const res = await asyncRequest.update(obj);
-        if (res&&res.code === 0) {
+        if (res && res.code === 0) {
           this.$notify.success({
             title: res.message,
             message: "",
           });
           await this.getInfor();
-        }else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        } else {
           this.$message.warning(res.message);
         }
         this.loading = false;
@@ -217,16 +217,16 @@ export default {
     async getInfor() {
       this.loading = true;
       const res = await asyncRequest.list({});
-      if (res&&res.code === 0 && res.data) {
+      if (res && res.code === 0 && res.data) {
         this.tableData = res.data;
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
-      }else {
+      } else {
         this.tableData = [];
       }
       this.loading = false;
     },
-       openModal(id) {
+    openModal(id) {
       this.showModel = true;
       this.modelId = id;
     },