shish 1 tahun lalu
induk
melakukan
9022b31ef8
2 mengubah file dengan 10 tambahan dan 11 penghapusan
  1. 2 6
      ghs/src/mock/userInfo.js
  2. 8 5
      ghs/src/views/order/refund-list.vue

+ 2 - 6
ghs/src/mock/userInfo.js

@@ -151,9 +151,7 @@ let menu = {
         {id: '201',parentId: 2,name: '客户列表',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/member/list',viewPath: 'views/member/list.vue',keepAlive: 1},
         {id: '201',parentId: 2,name: '客户列表',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/member/list',viewPath: 'views/member/list.vue',keepAlive: 1},
 		{id: '221',parentId: 2,name: '余额变动',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/member/custom-balance-list',viewPath: 'views/member/custom-balance-list.vue',keepAlive: 1},
 		{id: '221',parentId: 2,name: '余额变动',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/member/custom-balance-list',viewPath: 'views/member/custom-balance-list.vue',keepAlive: 1},
 		{id: '228',parentId: 2,name: '客户业绩',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/custom/yj',viewPath: 'views/custom/yj.vue',keepAlive: 1},
 		{id: '228',parentId: 2,name: '客户业绩',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/custom/yj',viewPath: 'views/custom/yj.vue',keepAlive: 1},
-		{id: '226',parentId: 2,name: '实时应收',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/custom/account',viewPath: 'views/custom/account.vue',keepAlive: 1},
-		{id: '230',parentId: 2,name: '历史应收',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/custom/pastAccount',viewPath: 'views/custom/pastAccount.vue',keepAlive: 1},
-		{id: '230',parentId: 2,name: '历收明细',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/custom/pastAccountChange',viewPath: 'views/custom/pastAccountChange.vue',keepAlive: 1},
+		{id: '226',parentId: 2,name: '应收统计',type: 1,icon: 'iconkehuguanli',orderNum: 2,router: '/custom/account',viewPath: 'views/custom/account.vue',keepAlive: 1},
 
 
 		{id: '3',parentId: null,name: '订单',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/order/list',viewPath: 'views/order/list.vue',keepAlive: 1},
 		{id: '3',parentId: null,name: '订单',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/order/list',viewPath: 'views/order/list.vue',keepAlive: 1},
         {id: '301',parentId: 3,name: '订单列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/list',viewPath: 'views/order/list.vue',keepAlive: 1},
         {id: '301',parentId: 3,name: '订单列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/list',viewPath: 'views/order/list.vue',keepAlive: 1},
@@ -167,9 +165,7 @@ let menu = {
 		{id: '15',parentId: null,name: '货商',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '15',parentId: null,name: '货商',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '1509',parentId: 15,name: '供货业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
 		{id: '1509',parentId: 15,name: '供货业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
-		{id: '1515',parentId: 15,name: '实时应付',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},
-		{id: '1522',parentId: 15,name: '历史应付',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/pastDue',viewPath: 'views/in/pastDue',keepAlive: 1},
-		{id: '1530',parentId: 15,name: '历付明细',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs-debt-record',viewPath: 'views/in/ghs-debt-record.vue',keepAlive: 1},
+		{id: '1515',parentId: 15,name: '应付统计',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},
 
 
 		{id: '1400',parentId: null,name: '采购',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 		{id: '1400',parentId: null,name: '采购',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 		{id: '1405',parentId: 1400,name: '采购记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 		{id: '1405',parentId: 1400,name: '采购记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},

+ 8 - 5
ghs/src/views/order/refund-list.vue

@@ -34,9 +34,9 @@
 				</span>
 				</span>
 			</template>
 			</template>
 
 
-			<template #table-column-updateTime="{scope}">
+			<template #table-column-passTime="{scope}">
 				<span>
 				<span>
-				{{ scope.row.updateTime?scope.row.updateTime.substr(5,11):'' }}
+				{{ scope.row.passTime?scope.row.passTime.substr(5,11):'' }}
 				</span>
 				</span>
 			</template>
 			</template>
 
 
@@ -47,7 +47,7 @@
 			</template>
 			</template>
 
 
 			<template #slot-search-option="{scope}">
 			<template #slot-search-option="{scope}">
-        		<el-input v-model="customName" placeholder="客户名称" size="mini" style="width:130px;" :clearable="true" ref="orderSearchRef" @input="changeSearch()" @focus="name=''"></el-input>
+        		<el-input v-model="customName" placeholder="客户名称" size="mini" style="width:110px;" :clearable="true" ref="customSearchRef" @input="changeSearch()" @focus="name=''"></el-input>
 				<el-select size="mini" v-model="currentStaffName" placeholder="操作人" style="width:110px;margin-left:8px;" @change="getKdStaff" :clearable="true">
 				<el-select size="mini" v-model="currentStaffName" placeholder="操作人" style="width:110px;margin-left:8px;" @change="getKdStaff" :clearable="true">
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
 				</el-select>
@@ -154,6 +154,9 @@ export default {
 		that.$service.shopAdmin.getAllStaff().then(res => {
 		that.$service.shopAdmin.getAllStaff().then(res => {
 			that.staffList = res.list
 			that.staffList = res.list
 		})
 		})
+		this.$nextTick(() => {
+      		this.$refs.customSearchRef.focus()
+    	})
 	},
 	},
 	methods: {
 	methods: {
 		changeSearch(){
 		changeSearch(){
@@ -297,8 +300,8 @@ export default {
 							width: 100
 							width: 100
 						},
 						},
 						{
 						{
-							prop: 'updateTime',
-							label: '最近后变更',
+							prop: 'passTime',
+							label: '通过日期',
 							align: 'center',
 							align: 'center',
 							width: 100
 							width: 100
 						}
 						}