Browse Source

bug修复3

阿拉蕾 2 years ago
parent
commit
34e4edd1f1

+ 2 - 2
src/api/crm/customer.js

@@ -77,8 +77,8 @@ export function exportCustomer(query) {
 
 export function exportCustomerByIds(customerId) {
   return request({
-    url: '/crm/customer/exportByIds',
-    method: 'get',
+    url: '/crm/customer/'+ customerId,
+    method: 'post',
   })
 }
 

+ 1 - 1
src/views/crm/customer/index.vue

@@ -228,7 +228,7 @@
           <el-table-column label="标签" align="center" prop="tags" />
           <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="进线客户详情" align="center" :show-overflow-tooltip="true" prop="registerDesc" />
-          <el-table-column label="领取时间" align="center" prop="startTime" />
+          <el-table-column label="领取时间" align="center" prop="receiveTime" />
           <el-table-column label="进线客户提交日期" align="center" prop="registerSubmitTime" />
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           </el-table-column>

+ 17 - 17
src/views/crm/customer/line.vue

@@ -71,7 +71,7 @@
             </el-select>
           </el-form-item>
 
-          
+
         <el-form-item label="创建时间" prop="createTime">
           <el-date-picker
               style="width:205.4px"
@@ -82,7 +82,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期">
             </el-date-picker>
-         
+
         </el-form-item>
         <el-form-item  label="客户来源" prop="source">
           <el-select filterable  v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
@@ -146,7 +146,7 @@
             v-hasPermi="['crm:customer:importLine']"
           >导入线索客户</el-button>
         </el-col>
-        
+
         <el-col :span="1.5">
           <el-button
             type="warning"
@@ -196,13 +196,13 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         </el-table-column>
-       
+
         <el-table-column label="最后一次跟进时间" align="center" prop="receiveTime" width="100">
         </el-table-column>
         <el-table-column label="入公海时间" align="center" prop="poolTime" width="100">
         </el-table-column>
       </el-table>
-      
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -210,7 +210,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"/>
 
-    
+
     <el-dialog :title="assign.title" :visible.sync="assign.open" width="800px" @close="closeAssignPop" append-to-body>
       <assign-user  ref="assignUser" @close="closeAssign"   />
     </el-dialog>
@@ -236,7 +236,7 @@
           <el-button @click="upload.open = false">取 消</el-button>
         </div>
     </el-dialog>
-   
+
     <el-dialog :title="source.title" :visible.sync="source.open" width="1000px" append-to-body>
        <edit-source ref="editSource" @close="closeSource()"></edit-source>
     </el-dialog>
@@ -416,7 +416,7 @@ export default {
       }
     };
   },
- 
+
   created() {
     this.getDicts("crm_customer_source").then((response) => {
       this.sourceOptions = response.data;
@@ -442,7 +442,7 @@ export default {
     this.getDicts("crm_customer_user_status").then((response) => {
       this.visitStatusOptions = response.data;
     });
- 
+
     this.getList();
   },
   methods: {
@@ -483,13 +483,13 @@ export default {
       setTimeout(() => {
         that.$refs.editSource.handleEdit(that.ids);
       }, 200);
-      
+
     },
     closeSource(){
         this.source.open=false;
         this.getList();
     },
-     
+
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then((response) => {
@@ -502,7 +502,7 @@ export default {
       this.form.address=nodes[0].pathLabels[0]+"-"+nodes[0].pathLabels[1]+"-"+nodes[0].pathLabels[2];
       this.form.cityIds=value.toString();
     },
-     
+
     handleAssign(){
       var that=this;
       var ids=this.ids;
@@ -649,12 +649,12 @@ export default {
         }).catch(function() {});
     },
 
-   
+
      /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "线索客户导入";
       this.upload.open = true;
-      
+
     },
     /** 下载模板操作 */
     importTemplate() {
@@ -679,7 +679,7 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
-   
+
     getCustomerName(customerName){
        if(customerName==null || customerName==""){
          return "";
@@ -709,7 +709,7 @@ export default {
     z-index: 100000;
   }
   .xy-content{
-   
+
   }
   .xy-img{
     border: 1px solid #dedede;
@@ -718,7 +718,7 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
-    justify-content: center;    
+    justify-content: center;
   }
   .footer{
       display: flex;

+ 2 - 2
src/views/crm/customer/my.vue

@@ -81,7 +81,7 @@
               >
             </el-date-picker>
       </el-form-item>
-      <el-form-item label="领取时间" prop="createTime">
+      <el-form-item label="领取时间" prop="receiveTime">
         <el-date-picker
               style="width:220px"
               clearable size="small"
@@ -199,7 +199,7 @@
         </template>
       </el-table-column>
       <el-table-column label="进线客户详情" align="center" :show-overflow-tooltip="true" prop="registerDesc" />
-      <el-table-column label="领取时间" align="center" prop="startTime" />
+      <el-table-column label="领取时间" align="center" prop="receiveTime" />
       <el-table-column label="进线客户提交日期" align="center" prop="registerSubmitTime" />
       <el-table-column label="创建时间" align="center" prop="customerCreateTime" width="180">
       </el-table-column>

+ 18 - 0
src/views/store/storePayment/index.vue

@@ -23,6 +23,24 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="交易单号" prop="bankTransactionId">
+            <el-input
+              v-model="queryParams.bankTransactionId"
+              placeholder="请输入交易单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="银行单号" prop="bankSerialNo">
+            <el-input
+              v-model="queryParams.bankSerialNo"
+              placeholder="请输入银行单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
 
       <el-form-item label="员工姓名" prop="companyUserNickName">