소스 검색

bug修复

chenrui 4 년 전
부모
커밋
ab7260791a

+ 6 - 6
src/config/router.config.js

@@ -1118,7 +1118,7 @@ export const asyncRouterMap = [
         meta: {
         meta: {
           title: '散件管理',
           title: '散件管理',
           icon: 'gold'
           icon: 'gold'
-          // permission: 'M_shop'
+          // permission: 'M_bulkWarehousing'
         },
         },
         children: [
         children: [
           {
           {
@@ -1129,7 +1129,7 @@ export const asyncRouterMap = [
             meta: {
             meta: {
               title: '散件入库',
               title: '散件入库',
               icon: 'gold'
               icon: 'gold'
-              // permission: 'M_goodsManage_list'
+              // permission: 'M_bulkWarehousingOrder'
             },
             },
             hideChildrenInMenu: true,
             hideChildrenInMenu: true,
             children: [
             children: [
@@ -1141,7 +1141,7 @@ export const asyncRouterMap = [
                   title: '散件入库单列表',
                   title: '散件入库单列表',
                   icon: 'gold',
                   icon: 'gold',
                   hidden: true
                   hidden: true
-                  // permission: 'M_goodsManage_list'
+                  // permission: 'M_bulkWarehousingOrder_list'
                 }
                 }
               },
               },
               {
               {
@@ -1152,7 +1152,7 @@ export const asyncRouterMap = [
                   title: '新增散件入库单',
                   title: '新增散件入库单',
                   icon: 'gold',
                   icon: 'gold',
                   hidden: true
                   hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  // permission: 'B_bulkWarehousingOrder_add'
                 }
                 }
               },
               },
               {
               {
@@ -1163,7 +1163,7 @@ export const asyncRouterMap = [
                   title: '编辑散件入库单',
                   title: '编辑散件入库单',
                   icon: 'gold',
                   icon: 'gold',
                   hidden: true
                   hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  // permission: 'B_bulkWarehousingOrder_edit'
                 }
                 }
               },
               },
               {
               {
@@ -1174,7 +1174,7 @@ export const asyncRouterMap = [
                   title: '散件入库单详情',
                   title: '散件入库单详情',
                   icon: 'gold',
                   icon: 'gold',
                   hidden: true
                   hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  // permission: 'B_bulkWarehousingOrder_detail'
                 }
                 }
               }
               }
             ]
             ]

+ 60 - 53
src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -16,8 +16,15 @@
       :label-col="formItemLayout.labelCol"
       :label-col="formItemLayout.labelCol"
       :wrapper-col="formItemLayout.wrapperCol" >
       :wrapper-col="formItemLayout.wrapperCol" >
       <a-form-model-item label="供应商" prop="state">
       <a-form-model-item label="供应商" prop="state">
-        <a-select placeholder="请输入名称或拼音查询,如果没有请点击 '+' 新增" allowClear v-model="form.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption" style="width: 80%;">
-        	<a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+        <a-select
+          placeholder="请输入名称查询,如果没有请点击 '+' 新增"
+          allowClear
+          v-model="form.dataSourceNo"
+          :showSearch="true"
+          option-filter-prop="children"
+          :filter-option="filterOption"
+          style="width: 80%;">
+          <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
         </a-select>
         </a-select>
         <a-button icon="plus" size="small" id="bulkWarehousingOrder-basicInfo-add-btn" style="margin-left: 10px;"></a-button>
         <a-button icon="plus" size="small" id="bulkWarehousingOrder-basicInfo-add-btn" style="margin-left: 10px;"></a-button>
       </a-form-model-item>
       </a-form-model-item>
@@ -40,70 +47,70 @@
 </template>
 </template>
 
 
 <script>
 <script>
-  import { VSelect } from '@/components'
-  export default{
-    name: 'BulkWarehousingOrderBasicInfoModal',
-    components: { VSelect },
-    props: {
-      openModal: { //  弹框显示状态
-        type: Boolean,
-        default: false
-      }
-    },
-    data(){
-      return{
-        isShow: this.openModal, //  是否打开弹框
-        formItemLayout: {
-          labelCol: { span: 6 },
-          wrapperCol: { span: 16 }
-        },
-        form: {
-          name: '', // 仓库名称
-          sort: '',  //  排序
-        },
-        rules: {
-          name: [
-            { required: true, message: '请输入仓库名称', trigger: 'blur' }
-          ],
-        },
-        brandData: [],  //  供应商  下拉数据
-      }
-    },
-    methods: {
-      //  保存
-      handleSave(){
-        this.isShow = false
-        this.$emit('ok')
+import { VSelect } from '@/components'
+export default {
+  name: 'BulkWarehousingOrderBasicInfoModal',
+  components: { VSelect },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
       },
       },
-      filterOption(input, option) {
-      	return (
-      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      	)
+      form: {
+        name: '', // 仓库名称
+        sort: '' //  排序
       },
       },
-    },
-    watch: {
-      //  父页面传过来的弹框状态
-      openModal (newValue, oldValue) {
-        this.isShow = newValue
+      rules: {
+        name: [
+          { required: true, message: '请输入仓库名称', trigger: 'blur' }
+        ]
       },
       },
-      //  重定义的弹框状态
-      isShow (newValue, oldValue) {
-        if (!newValue) {
-          this.$emit('close')
-        }
+      brandData: [] //  供应商  下拉数据
+    }
+  },
+  methods: {
+    //  保存
+    handleSave () {
+      this.isShow = false
+      this.$emit('ok')
+    },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
       }
       }
     }
     }
   }
   }
+}
 </script>
 </script>
 
 
 <style lang="less">
 <style lang="less">
   .bulkWarehousingOrder-basicInfo-modal{
   .bulkWarehousingOrder-basicInfo-modal{
     .ant-modal-body {
     .ant-modal-body {
-    	padding: 40px 40px 24px;
+      padding: 40px 40px 24px;
     }
     }
     .btn-cont {
     .btn-cont {
-    	text-align: center;
-    	margin: 35px 0 10px;
+      text-align: center;
+      margin: 35px 0 10px;
     }
     }
   }
   }
 </style>
 </style>

+ 3 - 4
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -24,7 +24,7 @@
                 :showSearch="true"
                 :showSearch="true"
                 option-filter-prop="children"
                 option-filter-prop="children"
                 :filter-option="filterOption">
                 :filter-option="filterOption">
-                <a-select-option v-for="item in supplierList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                <a-select-option v-for="item in supplierList" :key="item.supplierSn" :value="item.supplierSn">{{ item.supplierName }}</a-select-option>
               </a-select>
               </a-select>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
@@ -56,10 +56,9 @@
           </template>
           </template>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <span class="table-page-search-submitButtons" style="margin-top: 3px;">
             <span class="table-page-search-submitButtons" style="margin-top: 3px;">
-              <a-button size="small" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
-              <a-button size="small" style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
               <a-button
               <a-button
-                size="small"
                 style="margin-left: 8px"
                 style="margin-left: 8px"
                 type="danger"
                 type="danger"
                 @click="handleExport"
                 @click="handleExport"

+ 0 - 7
src/views/customerManagement/customerInfo/edit.vue

@@ -102,11 +102,6 @@
               <v-select code="PRICE_TYPE" id="customerManagementEdit-priceType" v-model="form.priceType" allowClear placeholder="请选择价格类型" ></v-select>
               <v-select code="PRICE_TYPE" id="customerManagementEdit-priceType" v-model="form.priceType" allowClear placeholder="请选择价格类型" ></v-select>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
-          <!-- <a-col :span="8">
-            <a-form-model-item label="支付方式" prop="payType">
-              <v-select code="PAY_TYPE" id="customerManagementEdit-payType" v-model="form.payType" allowClear placeholder="请选择支付方式" />
-            </a-form-model-item>
-          </a-col> -->
           <a-col :span="8">
           <a-col :span="8">
             <a-form-model-item label="收款方式" prop="settleStyleSn">
             <a-form-model-item label="收款方式" prop="settleStyleSn">
               <a-select id="customerManagementEdit-settleStyleSn" v-model="form.settleStyleSn" allowClear placeholder="请选择收款方式">
               <a-select id="customerManagementEdit-settleStyleSn" v-model="form.settleStyleSn" allowClear placeholder="请选择收款方式">
@@ -114,8 +109,6 @@
               </a-select>
               </a-select>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
-        </a-row>
-        <a-row :gutter="15">
           <a-col :span="8">
           <a-col :span="8">
             <a-form-model-item label="客户类型" prop="customerTypeSn">
             <a-form-model-item label="客户类型" prop="customerTypeSn">
               <a-select id="customerManagementEdit-customerTypeSn" v-model="form.customerTypeSn" allowClear placeholder="请选择客户类型">
               <a-select id="customerManagementEdit-customerTypeSn" v-model="form.customerTypeSn" allowClear placeholder="请选择客户类型">

+ 1 - 3
src/views/power/user/userList.vue

@@ -2,19 +2,17 @@
   <a-card size="small" :bordered="false">
   <a-card size="small" :bordered="false">
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
       <a-form layout="inline">
-        <a-row :gutter="48">
+        <a-row :gutter="15">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-item label="用户名称">
             <a-form-item label="用户名称">
               <a-input allowClear v-model="queryParam.name" placeholder="请输入用户名称"/>
               <a-input allowClear v-model="queryParam.name" placeholder="请输入用户名称"/>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-item label="手机号码">
             <a-form-item label="手机号码">
               <a-input allowClear v-model="queryParam.phone" placeholder="请输入手机号码"/>
               <a-input allowClear v-model="queryParam.phone" placeholder="请输入手机号码"/>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
             <a-form-item label="状态">
               <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态"></v-select>
               <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态"></v-select>

+ 20 - 20
src/views/power/user/userModal.vue

@@ -35,7 +35,20 @@
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
-
+        <a-row :gutter="20">
+          <a-col :span="24">
+            <!-- 用户账号 -->
+            <a-form-item label="用户账号" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
+              <a-input
+                placeholder="请输入用户账号"
+                :maxLength="50"
+                v-decorator="['formData.loginName', {
+                  initialValue: formData.loginName,
+                  rules: [{ required: true, message: '请输入用户账号!' },{pattern: /^[0-9A-Za-z]+$/, message: '用户账号为数字或大小写字母组成!'}] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
         <a-row :gutter="24">
           <!-- 性别 -->
           <!-- 性别 -->
           <a-col :span="12">
           <a-col :span="12">
@@ -109,7 +122,7 @@
                 style="min-height: 50px;"
                 style="min-height: 50px;"
                 :maxLength="500"
                 :maxLength="500"
                 placeholder="请输入备注(最多500个字符)"
                 placeholder="请输入备注(最多500个字符)"
-                autosize />
+                autoSize />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
@@ -160,10 +173,10 @@ export default {
         name: '',
         name: '',
         loginFlag: '', // 活动状态
         loginFlag: '', // 活动状态
         phone: '',
         phone: '',
+        loginName: '',
         sex: '',
         sex: '',
         remarks: ''
         remarks: ''
       }
       }
-
     }
     }
   },
   },
   methods: {
   methods: {
@@ -178,11 +191,8 @@ export default {
         console.log(values, 'values222')
         console.log(values, 'values222')
         if (!err) {
         if (!err) {
           values.formData.roleNames = values.formData.roleNames.join(',')
           values.formData.roleNames = values.formData.roleNames.join(',')
-          console.log(values.formData, ' formData.type222222222')
-          console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
           saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
           saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
+            if (res.status == 200) {
               this.$message.success(res.message ? res.message : '保存成功')
               this.$message.success(res.message ? res.message : '保存成功')
               this.$emit('refresh')
               this.$emit('refresh')
               setTimeout(function () {
               setTimeout(function () {
@@ -200,13 +210,14 @@ export default {
       this.formData.name = ''
       this.formData.name = ''
       this.formData.loginFlag = ''
       this.formData.loginFlag = ''
       this.formData.phone = ''
       this.formData.phone = ''
+      this.formData.loginName = ''
       this.formData.sex = ''
       this.formData.sex = ''
       this.formData.remarks = ''
       this.formData.remarks = ''
     },
     },
     // 获取角色列表接口
     // 获取角色列表接口
     getRoleList () {
     getRoleList () {
       getRoleList().then(res => {
       getRoleList().then(res => {
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.roleList = res.data
           this.roleList = res.data
         } else {
         } else {
           this.$message.warning(res.message)
           this.$message.warning(res.message)
@@ -231,13 +242,9 @@ export default {
           this.formData = Object.assign({}, this.data)
           this.formData = Object.assign({}, this.data)
           delete this.formData.no
           delete this.formData.no
           let roleNames = this.formData.roleNames
           let roleNames = this.formData.roleNames
-          console.log(roleNames, 'roleNames')
           if (roleNames) {
           if (roleNames) {
             roleNames = roleNames.split(',')
             roleNames = roleNames.split(',')
-            console.log(roleNames, 'roleNames22')
             const arr = []
             const arr = []
-            console.log(this.roleList, 'this.roleList')
-
             roleNames.map(item => {
             roleNames.map(item => {
               const row = this.roleList.find(a => {
               const row = this.roleList.find(a => {
                 return a.name == item
                 return a.name == item
@@ -246,16 +253,11 @@ export default {
                 arr.push(row.id)
                 arr.push(row.id)
               }
               }
             })
             })
-
-            console.log(arr, 'arrs')
             this.formData.roleNames = arr
             this.formData.roleNames = arr
           } else {
           } else {
             this.formData.roleNames = []
             this.formData.roleNames = []
           }
           }
-
           this.formData.loginFlag = Number(this.formData.loginFlag)
           this.formData.loginFlag = Number(this.formData.loginFlag)
-          // this.formData.sex = Number(this.formData.sex)
-          console.log(this.formData, 'this.formData')
         } else {
         } else {
           this.titleText = '添加用户'
           this.titleText = '添加用户'
         }
         }
@@ -267,9 +269,7 @@ export default {
 }
 }
 </script>
 </script>
 
 
-<style >
-  .modalBox{
-  }
+<style>
   .ant-modal-footer {
   .ant-modal-footer {
     display: none;
     display: none;
   }
   }