Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -246,7 +246,7 @@
     stroke: @m-grey17;
 }
 
-.add-custom {
+.add-custom,.commonModal {
     .ant-modal-content {
         background: #0F1A25;
         border-radius: 5px;
@@ -274,7 +274,7 @@
             }
         }
         .ant-modal-body {
-
+            min-height: 380px;
         }
         .ant-modal-footer {
             border-top: 0;
@@ -294,6 +294,20 @@
                     color: @m-white0-hover;
                 }
             }
+            .ant-btn.cancelBtn {
+                width: 200px;
+                height: 34px;
+                line-height: 34px;
+                border: 1px solid @m-blue10;
+                border-radius: 3px;
+                background: transparent;
+                font-size: 16px;
+                color: @m-blue10;
+                margin-right: 20px;
+                &:hover {
+                    border-color: rgba(@m-blue10, .8);
+                }
+            }
         }
     }
 }

src/assets/styles/variables.less

@@ -53,6 +53,7 @@
 @m-blue8: #3163BA;
 @m-blue8-hover: rgba(@m-blue8, .8);
 @m-blue9: #4179DB;
+@m-blue10: #0C95FF;
 @m-blue9-hover: rgba(@m-blue9, .8);
 @body-bg: #e9eef3;
 @m-white0: #ffffff;

src/views/information/custom/compoments/disableCustom/index.vue

@@ -1,16 +1,135 @@
 <template>
   <!-- 停用客户资料-->
-  <a-modal class="custom-disable"
+  <a-modal class="commonModal warehouse-disable"
            title="停用客户资料"
            v-model:visible="visible"
            @cancel="cancel"
            width="890px">
     <template #footer>
       <a-button key="submit"
+                class="cancelBtn"
+                @click="cancel">取消</a-button>
+                <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">完成</a-button>
+                @click="submit">确认停用</a-button>
     </template>
+    <a-form class="inlineForm" :form="form" @submit="handleSearch">
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="客户类型" >
+                        <span class="white">企业</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="企业名称">
+                        <span class="white">深圳市前海矿业有限公司</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="企业简称">
+                        <span class="white">前海矿业</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="证件类型">
+                        <span class="white">营业执照</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="法定代表人">
+                        <span class="white">李顺利</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="证件号码">
+                        <span class="white">4328648236492432</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="纳税人识别号">
+                        <span class="white">57465736DR46456</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="营业执照">
+                        <a class="blue">查看附件</a>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="联系人">
+                        <span class="white">王平</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="联系人手机号">
+                        <span class="white">13745653421</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="联系电话">
+                        <span class="white">0755-34342544</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="状态">
+                        <span class="green">正常</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="24"
+                >
+                    <a-form-item label="通讯地址">
+                        <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="24"
+                >
+                    <a-form-item label="备注">
+                        <span class="white">无</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
   </a-modal>
 </template>
 
@@ -42,6 +161,6 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.custom-disable {
+.arehouse-disable {
 }
 </style>;

src/views/information/warehouse-info/compoments/addWarehouse/index.vue

@@ -0,0 +1,143 @@
+<template>
+    <!-- 新增仓库信息 -->
+    <a-modal class="add-warehouse" title="新增仓库信息" v-model:visible="visible" @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" :form="form" @submit="handleSearch">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="仓库类型">
+                        <a-select class="typeSelect" style="width: 200px" placeholder="请选择仓库类型">
+                            <a-select-option value="1">
+                                仓库一
+                            </a-select-option>
+                            <a-select-option value="2">
+                                仓库二
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="仓库名称">
+                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入仓库名称" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="仓库简称">
+                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入仓库简称" />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="联系人">
+                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入联系人" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="联系电话">
+                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入联系电话" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="所在地区">
+                        <a-select class="inlineFormSelect" style="width: 205px" placeholder="请选择省">
+                            <a-select-option value="1">
+                                广东省
+                            </a-select-option>
+                            <a-select-option value="2">
+                                湖南省
+                            </a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect" style="width: 205px" placeholder="请选择市">
+                            <a-select-option value="1">
+                                深圳市
+                            </a-select-option>
+                            <a-select-option value="2">
+                                岳阳市
+                            </a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect" style="width: 205px" placeholder="请选择县(区)">
+                            <a-select-option value="1">
+                                区一
+                            </a-select-option>
+                            <a-select-option value="2">
+                                区二
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="详细地址">
+                        <a-input class="dialogInput" style="width: 635px" placeholder="请输入详细地址" />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
+</template>
+
+<script lang="ts">
+    import { defineComponent, ref } from 'vue';
+    import { closeModal } from '@/setup/controlModal/index';
+    import { initData } from '@/setup/methods/index';
+
+    export default defineComponent({
+        name: 'add-warehouse',
+        components: {},
+        setup() {
+            const { visible, cancel } = closeModal('addCustomInfo');
+            const loading = ref<boolean>(false);
+            function submit() {
+                loading.value = true;
+                setTimeout(() => {
+                    loading.value = false;
+                    cancel();
+                }, 2000);
+            }
+            initData(() => {});
+            return {
+                visible,
+                cancel,
+                submit,
+                loading,
+            };
+        },
+    });
+</script>
+
+<style lang="less">
+    .add-warehouse {
+    }
+    .upload {
+        display: inline-flex;
+        .ant-btn.uploadBtn {
+            width: 60px;
+            height: 30px;
+            background: @m-blue0;
+            border: 0;
+            padding: 0;
+            text-align: center;
+            font-size: 14px;
+            color: @m-white0;
+            .rounded-corners(3px);
+            &:hover {
+                background: rgba(@m-blue0, 0);
+                color: rgba(@m-white0, 0.8);
+            }
+        }
+        .look {
+            color: @m-blue0;
+            font-size: 14px;
+            margin-left: 10px;
+            cursor: pointer;
+        }
+    }</style
+>;

src/views/information/warehouse-info/compoments/disableWarehouse/index.vue

@@ -0,0 +1,116 @@
+<template>
+  <!-- 停用仓库信息-->
+  <a-modal class="commonModal warehouse-disable"
+           title="停用仓库信息"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                class="cancelBtn"
+                @click="cancel">取消</a-button>
+                <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">确认停用</a-button>
+    </template>
+    <a-form class="inlineForm" :form="form" @submit="handleSearch">
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="仓库类型" >
+                        <span class="white">自有库</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="仓库名称">
+                        <span class="white">深圳市南储公司2号库房</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="仓库简称">
+                        <span class="white">南储深圳2号库</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="联系人">
+                        <span class="white">王平</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="联系电话">
+                        <span class="white">13832676234</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="状态">
+                        <span class="green">正常</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="所在地区">
+                        <span class="white">广东省深圳市南山区</span>
+                    </a-form-item>
+                </a-col>
+                <a-col
+                :span="12"
+                >
+                    <a-form-item label="详细地址">
+                        <span class="white">深南大道1290号仓库</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/setup/controlModal/index';
+
+export default defineComponent({
+    name: 'custom-disable',
+    components: {},
+    setup() {
+        const { visible, cancel } = closeModal('disableCustomInfo');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.warehouse-disable {
+}
+</style>;

src/views/information/warehouse-info/compoments/filterTable/index.vue

@@ -0,0 +1,130 @@
+<template>
+  <!-- 过滤仓库信息表格 -->
+  <div class="filter-custom-table">
+    <a-select label-in-value
+              class="conditionSelect"
+              style="width: 120px"
+              v-model:value="userinfotype"
+              placeholder="全部仓库类型"
+              @change="handleChange">
+      <a-select-option value="1">仓库类型一</a-select-option>
+      <a-select-option value="2">仓库类型二</a-select-option>
+    </a-select>
+    <a-input v-model:value="nickname"
+             class="tableConditionInput"
+             placeholder="模糊搜索仓库名称" />
+    <a-input v-model:value="name"
+             class="tableConditionInput"
+             placeholder="模糊搜索仓库地址" />
+    <a-button class="selectBtn"
+              @click="search">查询</a-button>
+    <a-button class="selectBtn"
+              @click="reset">重置</a-button>
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, SetupContext } from 'vue';
+
+// 搜索
+function handleSearch(context: SetupContext) {
+    const nickname = ref<string>('');
+    const name = ref<string>('');
+    interface Value {
+        key: string;
+        value: string;
+    }
+    let useType = '';
+    const userinfotype = ref<number>(0);
+    function handleChange(value: Value) {
+        useType = value.value;
+        search();
+    }
+    function search() {
+        const result = { nickname: [nickname.value], name: [name.value], userinfotype: [useType] };
+        context.emit('search', result);
+    }
+    function reset() {
+        nickname.value = '';
+        name.value = '';
+        userinfotype.value = 0;
+        useType = '';
+        search();
+    }
+
+    return { nickname, name, search, reset, userinfotype, handleChange };
+}
+
+export default defineComponent({
+    name: 'filter-custom-table',
+    components: {},
+    setup(props, context) {
+        return {
+            ...handleSearch(context),
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.filter-custom-table {
+    width: 100%;
+    display: inline-flex;
+    padding-top: 9px;
+    padding-bottom: 6px;
+}
+.ant-select-single:not(.ant-select-customize-input) {
+    margin-right: 10px;
+    // background: #252D34;
+    // .rounded-corners(3px);
+    .ant-select-selector {
+        height: 30px;
+        padding: 0 8px;
+        background: @m-grey9;
+        border: none;
+        .rounded-corners(3px);
+        color: @m-grey10;
+        .ant-select-arrow {
+            right: 8px;
+            color: @m-grey1;
+        }
+    }
+    .ant-select-arrow {
+        color: @m-grey1;
+    }
+    .ant-select-selection-item {
+        color: @m-white1;
+    }
+}
+.conditionSelect + .conditionSelect {
+    margin-left: 10px;
+}
+.selectBtn.ant-btn {
+    margin-left: 10px;
+    width: 80px;
+    height: 30px;
+    line-height: 31px;
+    text-align: center;
+    background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
+.operBtn.ant-btn:extend(.selectBtn.ant-btn) {
+    background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
+</style>;

src/views/information/warehouse-info/list/normal-use/index.vue

@@ -1,13 +1,12 @@
 <template>
   <!-- 仓库信息: 正常 -->
   <div class="warehouse-info-normal">
-    仓库信息: 正常
-    <div class="table-operations">
-      <a-button>查询</a-button>
-      <a-button>重置</a-button>
-      <a-button>新增</a-button>
-    </div>
-    <a-table :columns="columns"
+    <filterCustomTable @search="search">
+        <a-button class="operBtn" @click="openAction">新增</a-button>
+    </filterCustomTable>
+    <a-table 
+             class="topTable"
+             :columns="columns"
              :pagination="false"
              rowKey="key"
              :data-source="wareHouseInfos" />
@@ -18,6 +17,7 @@
 import { computed, defineComponent, ref } from 'vue';
 
 import { initData } from '@/setup/methods/index';
+import filterCustomTable from '@/views/information/warehouse-info/compoments/filterTable/index.vue';
 import { QueryWareHouse } from '@/goServiceAPI/ermcp/warehouse-info/index';
 import { ErmcpWareHouseInfo } from '@/goServiceAPI/ermcp/warehouse-info/interface';
 import { message } from 'ant-design-vue';
@@ -94,7 +94,9 @@ function add() {
 
 export default defineComponent({
     name: 'warehouse-info-normal',
-    components: {},
+    components: {
+        filterCustomTable
+    },
     setup() {
         const { wareHouseInfos, actionQuery, columns, getColumns, search } = getWarehouseInfoList();
         initData(() => {