Przeglądaj źródła

【ID1005409】
【ID1005411】
【ID1005410】修复bug单

zhangdan 4 lat temu
rodzic
commit
448ddf5310

+ 6 - 6
src/views/businessManage/partnerManage/addPartnerModal.vue

@@ -9,12 +9,12 @@
       :centered="true"
       :centered="true"
       :title="titleText">
       :title="titleText">
       <a-form id="components-form-demo-validate-other" ref="form" :form="form" v-bind="formItemLayout" @submit="handleSubmit">
       <a-form id="components-form-demo-validate-other" ref="form" :form="form" v-bind="formItemLayout" @submit="handleSubmit">
-        <a-form-item label="供应商名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+        <a-form-item label="商名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
           <a-input
             id="addSupplierModal-name"
             id="addSupplierModal-name"
             :maxLength="30"
             :maxLength="30"
             v-decorator="['formData.name', { initialValue: formData.name,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入供应商名称(最多30个字符)!' }] }]"
             v-decorator="['formData.name', { initialValue: formData.name,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入供应商名称(最多30个字符)!' }] }]"
-            placeholder="请输入供应商名称(最多30个字符)"
+            placeholder="请输入商名称(最多30个字符)"
             allowClear />
             allowClear />
         </a-form-item>
         </a-form-item>
         <a-form-item label="负责人名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-form-item label="负责人名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
@@ -25,12 +25,12 @@
             placeholder="请输入联系人"
             placeholder="请输入联系人"
             allowClear />
             allowClear />
         </a-form-item>
         </a-form-item>
-        <a-form-item label="负责人手机号码" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+        <a-form-item label="负责人电话" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
           <a-input
             id="addSupplierModal-contactPhone"
             id="addSupplierModal-contactPhone"
-            :maxLength="11"
-            v-decorator="['formData.contactPhone', { initialValue: formData.contactPhone,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入手机号码!' }] }]"
-            placeholder="请输入手机号码"
+            type="number"
+            v-decorator="['formData.contactPhone', { initialValue: formData.contactPhone,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入负责人电话!' }] }]"
+            placeholder="请输入负责人电话"
             allowClear />
             allowClear />
         </a-form-item>
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">

+ 16 - 31
src/views/businessManage/partnerManage/partnerManage.vue

@@ -5,21 +5,10 @@
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
         <a-row :gutter="48">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-form-item label="结算时间:" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
-              <a-range-picker
-                style="width:100%"
-                id="PaySettlementRecords-queryOrderDate"
-                :disabledDate="disabledDate"
-                v-model="queryOrderDate"
-                format="YYYY-MM-DD"
-                :placeholder="['开始时间', '结束时间']" />
-            </a-form-item>
+            <a-form-item label="商户名称"><a-input allowClear v-model.trim="queryParam.name" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-form-item label="供应商名称"><a-input allowClear v-model.trim="queryParam.name" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="负责人手机号码"><a-input allowClear v-model.trim="queryParam.contactPhone" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
+            <a-form-item label="负责人电话"><a-input allowClear v-model.trim="queryParam.contactPhone" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="OperateJournal-refreshTable">查询</a-button>
             <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="OperateJournal-refreshTable">查询</a-button>
@@ -100,11 +89,8 @@ export default {
     return {
     return {
       queryParam: {
       queryParam: {
         name: '',
         name: '',
-        beginDate: '',
-        endDate: '',
         contactPhone: ''
         contactPhone: ''
       },
       },
-	  queryOrderDate: undefined,
 	  openSupplierModal: false, // 默认关闭弹窗
 	  openSupplierModal: false, // 默认关闭弹窗
 	  isQrCodeModal: false, //  查看小程序码   弹框展示状态
 	  isQrCodeModal: false, //  查看小程序码   弹框展示状态
 	  qrCode: '',
 	  qrCode: '',
@@ -138,7 +124,7 @@ export default {
 		  align: 'center'
 		  align: 'center'
         },
         },
         {
         {
-		  title: '手机号码',
+		  title: '负责人电话',
 		  width: 100,
 		  width: 100,
 		  dataIndex: 'contactPhone',
 		  dataIndex: 'contactPhone',
 		  align: 'center',
 		  align: 'center',
@@ -168,13 +154,13 @@ export default {
       loadData: parameter => {
       loadData: parameter => {
 		  const searchData = Object.assign(parameter, this.queryParam)
 		  const searchData = Object.assign(parameter, this.queryParam)
 		  console.log(this.queryOrderDate, 'this.queryOrderDate')
 		  console.log(this.queryOrderDate, 'this.queryOrderDate')
-		  if (this.queryOrderDate && this.queryOrderDate.length) {
-		    searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-		    searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-		  } else {
-		    searchData.beginDate = ''
-		    searchData.endDate = ''
-		  }
+		  // if (this.queryOrderDate && this.queryOrderDate.length) {
+		  //   searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
+		  //   searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+		  // } else {
+		  //   searchData.beginDate = ''
+		  //   searchData.endDate = ''
+		  // }
         return getSellerList(
         return getSellerList(
           searchData
           searchData
         ).then(res => {
         ).then(res => {
@@ -203,9 +189,9 @@ export default {
   },
   },
   methods: {
   methods: {
 	  // 禁止不可选日期
 	  // 禁止不可选日期
-	  disabledDate (current) {
-	    return current && current > moment().endOf('day')
-	  },
+	  // disabledDate (current) {
+	  //   return current && current > moment().endOf('day')
+	  // },
     showModal () {
     showModal () {
       this.itemId = null
       this.itemId = null
 	  this.itemData = {}
 	  this.itemData = {}
@@ -224,10 +210,10 @@ export default {
     },
     },
     // 重置
     // 重置
     resetForm () {
     resetForm () {
-      this.queryOrderDate = undefined
+      // this.queryOrderDate = undefined
       this.queryParam.name = ''
       this.queryParam.name = ''
-	  this.queryParam.beginDate = ''
-	  this.queryParam.endDate = ''
+	  // this.queryParam.beginDate = ''
+	  // this.queryParam.endDate = ''
 	  this.queryParam.contactPhone = ''
 	  this.queryParam.contactPhone = ''
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
@@ -256,7 +242,6 @@ export default {
 	      this.isQrCodeModal = true
 	      this.isQrCodeModal = true
 	    } else {
 	    } else {
 	      this.qrCode = ''
 	      this.qrCode = ''
-	      this.$message.error(res.message)
 	    }
 	    }
 	  })
 	  })
     },
     },

+ 1 - 1
src/views/businessManage/userManage/userModal.vue

@@ -57,7 +57,7 @@
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="12">
           <a-col :span="12">
-            <a-form-item label="所属合作商" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+            <a-form-item label="所属商" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-select
               <a-select
                 placeholder="请选择"
                 placeholder="请选择"
                 allowClear
                 allowClear