zhangjinxing 3 years ago
parent
commit
ad73ef1dd2

+ 2 - 2
src/apis/service/purchaseIn/addStore/index.js

@@ -3,7 +3,7 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 添加
-  add: (data, params) => http(api + "add", data, "post", params),
+  // add: (data, params) => http(api + "add", data, "post", params),
   // 删除
   delete: (data, params) => http(api + "delete", data, "post", params),
   // 分页查询
@@ -25,7 +25,7 @@ export default {
   // 获取仓库归属公司列表
   getCompany: (data, params) => http(api + 'supplierlist', data, 'post', params),
   //新建仓库
-  addStock: (data, params) => http(api + 'WareHouse/add', data, 'post', params),
+  add: (data, params) => http(api + 'WareHouse/add', data, 'post', params),
   
   
 };

+ 0 - 2
src/components/AreaSelect.vue

@@ -35,8 +35,6 @@ export default {
           let res = {};
           if (level === 0) {
             res = await asyncRequest.provinceList({});
-            console.log(value);
-            console.log(res.data);
           } else if (level === 1) {
             res = await asyncRequest.cityList({ code: value });
           } else {

+ 6 - 5
src/layout/components/TagsView/index.vue

@@ -56,6 +56,7 @@ export default {
   },
   computed: {
     visitedViews() {
+      
       return this.$store.state.tagsView.visitedViews;
     },
     routes() {
@@ -220,7 +221,7 @@ export default {
   height: 34px;
   width: 100%;
   background: #fff;
-  border-bottom: 1px solid #EBEEF5;
+  border-bottom: 1px solid #ebeef5;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
   .tags-view-wrapper {
     .tags-view-item {
@@ -231,10 +232,10 @@ export default {
       line-height: 25px;
       border-radius: 4px;
       overflow: hidden;
-      border: 1px solid #EBEEF5;
+      border: 1px solid #ebeef5;
       color: #898989;
-      background: #F2F6FC;
-      padding:  0 8px;
+      background: #f2f6fc;
+      padding: 0 8px;
       font-size: 12px;
       margin-left: 5px;
       margin-top: 4px;
@@ -304,7 +305,7 @@ export default {
       font-size: 18px;
       transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
       transform-origin: 100% 50%;
-      margin-left:-3px;
+      margin-left: -3px;
       margin-right: -8px;
       &:before {
         transform: scale(0.6);

+ 0 - 369
src/views/purchaseIn/addStore/index copy.vue

@@ -1,369 +0,0 @@
-<template>
-  <div class="addStore pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
-      {{ title }}
-      <el-form
-        :model="ruleForm"
-        :rules="rules"
-        ref="ruleForm"
-        label-width="150px"
-      >
-        <el-form-item label="仓库所在公司" prop="storeToCompany">
-          <el-cascader
-            placeholder="请选择出库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="ruleForm.selectStock_go"
-            :options="ruleForm.selectStock_go_options"
-            style="width: 30%"
-            @change="stockName(true)"
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item label="请输入仓库名称" prop="stockName">
-          <el-input
-            placeholder="请输入仓库名称"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="ruleForm.stockName"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="仓库负责人" prop="stockCharge">
-          <el-cascader
-            placeholder="请选择仓库负责人"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="ruleForm.stockDutyer"
-            :options="ruleForm.stockDutyer_options"
-            style="width: 30%"
-            @change="stockName()"
-          ></el-cascader>
-        </el-form-item>
-        <!-- 省/市/区选择组件 -->
-        <el-form-item label="仓库所在省/市/区" prop="stockToArea">
-          <AreaSelect @areaSelect="areaSelect"></AreaSelect>
-        </el-form-item>
-        <!-- 仓库详细地址 -->
-        <el-form-item label="仓库所在详细地址" prop="stockDetail">
-          <el-input
-            :size="searchSize"
-            placeholder="请输入内容"
-            v-model="input"
-            clearable
-          >
-          </el-input>
-        </el-form-item>
-        <!-- 保 存 并 发 起 流 程 -->
-        <el-form-item label="" prop="stock_go_product">
-          <el-col :span="24" style="text-align: right; margin-top: 10px">
-            <el-button type="primary" @click="save">保 存 </el-button>
-            <el-button type="warning" @click="submitForm"
-              >保 存 并 发 起 流 程
-            </el-button>
-          </el-col>
-        </el-form-item>
-      </el-form>
-
-      <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 resToken from "@/mixins/resToken";
-import ExTable from "@/components/ExTableNew.vue";
-import statusList from "@/assets/js/statusList";
-import asyncRequest from "@/apis/service/purchaseIn/addStore";
-import addEdit from "./addEdit";
-import { mapGetters } from "vuex";
-import AreaSelect from "@/components/AreaSelect.vue"; //省/市/区选择组件
-
-// let id = 10;
-export default {
-  name: "addStore",
-  mixins: [mixinPage, resToken],
-  components: {
-    addEdit,
-    ExTable,
-    AreaSelect, //省/市/区选择组件
-  },
-  computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "addStore"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      title: "",
-      ruleForm: {
-        selectStock_go: "", //出库仓库
-        selectStock_go_options: [], //出库仓库列表
-        stockName: "", //仓库名称
-        stockDutyer: "", //仓库负责人
-        stockDutyer_options: [], //仓库负责人列表
-      },
-      //省市区接口入参
-      addr_code: {
-        provice_code: "",
-        city_code: "",
-        area_code: "",
-      },
-      rules: {
-        storeToCompany: [
-          {
-            required: true,
-            message: "请选择仓库所在公司",
-            trigger: "blur",
-          },
-        ],
-        stockName: [
-          {
-            required: true,
-            message: "请输入仓库名称",
-            trigger: "blur",
-          },
-        ],
-        stockCharge: [
-          {
-            required: true,
-            message: "请选择仓库负责人",
-            trigger: "blur",
-          },
-        ],
-        stockToArea: [
-          {
-            required: true,
-            message: "请选择仓库所在地址",
-            trigger: "blur",
-          },
-        ],
-        stockDetail: [
-          {
-            required: true,
-            message: "请选择仓库所在地址",
-            trigger: "blur",
-          },
-        ],
-      },
-      sitem: null,
-      // 状态
-      // statusOptions: [
-      //   { id: "0", label: "禁用" },
-      //   { id: "1", label: "启用" },
-      // ],
-      // statusList: statusList,
-      loading: true,
-      showModel: false,
-      isDetail: false,
-      modelId: 0,
-      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() {},
-
-  methods: {
-    async initForm() {
-      console.log(this.id);
-      this.loading = true;
-      // await this.getClist();
-      // 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;
-    },
-
-    // 省市区组件抛出的执行事件
-    areaSelect(val) {
-      this.addr_code.provice_code = val[0];
-      this.addr_code.city_code = val[1];
-      this.addr_code.area_code = val[1];
-      console.log(this.addr_code);
-    },
-    submitForm(formName) {
-      console.log("submitForm");
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert("submit!");
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    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>
-</style>
-   

+ 36 - 25
src/views/purchaseIn/addStore/index.vue

@@ -63,7 +63,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-form-item label="负责人" prop="stockCharge" style="width: 50%">
             <el-select
               :size="searchSize"
@@ -166,7 +165,6 @@ import ExTable from "@/components/ExTableNew.vue";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 import AreaSelect from "@/components/AreaSelect.vue"; //省/市/区选择组件
-
 import { isMobile } from "@/utils/validate";
 export default {
   name: "addStore",
@@ -205,7 +203,9 @@ export default {
       }
     };
     return {
+      // addId: this.$route.query.id,
       addId: "",
+      // route: this.$route,
       roleList: [],
       loading: false,
       title: "添加账号",
@@ -218,18 +218,18 @@ export default {
         area_code: "",
       },
       ruleForm: {
-        // storeToCompany: "",
-        // stockToArea: [],
-        // selectStock_go: "", //公司
-        // selectStock_go_options: [], //公司列表
-        // stockName: "", //仓库名称
-        // stockDutyer: "", //仓库负责人
-        // stockDutyer_options: [], //仓库负责人列表
-        // stockDetail: [], //仓库详细地址
-        // linker: "", //收发货联系人
-        // linker_mobile: "", //收发货人联系电话
-        // linker_addr: [], //收发货地址
-        // linker_detail: "",
+        storeToCompany: "",
+        stockToArea: [],
+        selectStock_go: "", //公司
+        selectStock_go_options: [], //公司列表
+        stockName: "", //仓库名称
+        stockDutyer: "", //仓库负责人
+        stockDutyer_options: [], //仓库负责人列表
+        stockDetail: [], //仓库详细地址
+        linker: "", //收发货联系人
+        linker_mobile: "", //收发货人联系电话
+        linker_addr: [], //收发货地址
+        linker_detail: "",
       }, //
       rulesThis: this.rules,
       rules: {
@@ -321,9 +321,16 @@ export default {
       },
     };
   },
-
+  watch: {
+    $route: function (val, old) {
+      console.log(val.query.id);
+      this.addId = val.query.id;
+    },
+  },
   mounted() {
-    this.addId = this.$route.query.id;
+    console.log(this.$route);
+    // console.log(this.$route.query);
+    // this.addId = this.$route.query.id;
     this.getCompany();
     this.initForm();
     // this.addStock();
@@ -380,19 +387,22 @@ export default {
       // await this.getClist();
       // await this.getRole();
       this.ruleForm = {
-        stockName: "123", //仓库名称
+        stockName: "", //仓库名称
         stockDutyer: "", //仓库负责人
         stockDutyer: "", //仓库负责人
         linker: "", //收发货联系人
         linker_mobile: "", //收发货人联系电话
         linker_addr: [], //收发货地址
+        selectStock_go_options: [],
+        stockDutyer_options: [],
       };
       if (this.addId === "add") {
         console.log("新建仓库节点");
         console.log(this.ruleForm);
         this.rulesThis = this.rules;
         await this.resetForm();
-      } else {
+      } else if (this.addId === "detail") {
+        console.log("detail");
         if (this.isDetail) {
           this.title = "账号详情";
           this.rulesThis = {};
@@ -471,6 +481,7 @@ export default {
     async submitForm(formName) {
       console.log(this.parmValue);
       this.$refs[formName].validate((valid) => {
+        console.log(valid);
         if (valid) {
           alert("submit!");
           this.getList();
@@ -480,8 +491,9 @@ export default {
         }
       });
     },
+    // 表单提交
     async getList() {
-      const res = await asyncRequest.addStock(this.parmValue);
+      const res = await asyncRequest.add(this.parmValue);
       if (res && res.code === 0 && res.data) {
         console.log(res.data);
       } else if (res && res.code >= 100 && res.code <= 104) {
@@ -501,14 +513,13 @@ export default {
       };
       const res = await asyncRequest.getlist(obj);
       if (res && res.code === 0 && res.data) {
-        // console.log(res.data.list);
+        console.log(res.data.list);
         res.data.list.forEach((element) => {
-          // console.log(element.nickname);
-          console.log();
           let dutyer = {
             label: element.nickname,
-            value: element.depart[0].name || "",
+            value: element.depart[0] ? element.depart[0].name : "",
           };
+          // console.log(this.ruleForm.stockDutyer_options);
           this.ruleForm.stockDutyer_options.push(dutyer);
         });
       } else if (res && res.code >= 100 && res.code <= 104) {
@@ -528,13 +539,13 @@ export default {
       };
       const res = await asyncRequest.getCompany(obj);
       if (res && res.code === 0 && res.data) {
-        // console.log(res.data.list);
+        console.log(res.data.list);
         res.data.list.forEach((element) => {
-          // console.log(element.nickname);
           let company = {
             label: element.name,
             value: element.code,
           };
+          // console.log(this.ruleForm.selectStock_go_options);
           this.ruleForm.selectStock_go_options.push(company);
           // this.ruleForm.stockDutyer_options.push(dutyer);
         });

+ 16 - 0
src/views/purchaseIn/storeSet/index.vue

@@ -143,6 +143,21 @@
                 </el-button>
               </el-col>
 
+              <el-col
+                :span="3"
+                style="width: 56px; margin-left: 10px"
+                class="mr10"
+              >
+                <el-button
+                  class="fl"
+                  :size="searchSize"
+                  type="primary"
+                  @click="addList('detail')"
+                >
+                  新111
+                </el-button>
+              </el-col>
+
               <el-col :span="3" style="width: 56px" class="fr">
                 <el-button
                   :size="searchSize"
@@ -378,6 +393,7 @@ export default {
 
   methods: {
     addList(id) {
+      console.log(id);
       console.log("点击了新建按钮");
       this.$router.push({
         path: "addStore",