pengyh 1 vuosi sitten
vanhempi
commit
93fe13acca

+ 2 - 1
src/views/auxiliaryFittings/attachmentProfile/index.vue

@@ -494,12 +494,13 @@ export default {
   },
   },
   methods: {
   methods: {
     // 列表请求函数
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
 	    var pam = JSON.parse(JSON.stringify(p))
 	    if (this.examineStatus) {
 	    if (this.examineStatus) {
 	      pam.params.push({ "param": "b.examine_status", "compare": "=", "value": this.examineStatus })
 	      pam.params.push({ "param": "b.examine_status", "compare": "=", "value": this.examineStatus })
 	    }
 	    }
+		cb && cb(pam)
 	    return listPageV2(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	  } catch (error) {
 	    console.log(error)
 	    console.log(error)

+ 2 - 1
src/views/auxiliaryFittings/salesManagement/attachmentNewReturn/index.vue

@@ -80,10 +80,11 @@ export default {
 		this.$refs.pageRef.refreshList()
 		this.$refs.pageRef.refreshList()
 	},
 	},
     // 列表请求函数
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
 	    var pam = JSON.parse(JSON.stringify(p))
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' },{ "param": "a.type", "compare": "=", "value": 'NEW' },{'param': 'a.flag', "compare": "=", "value": this.flag})
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' },{ "param": "a.type", "compare": "=", "value": 'NEW' },{'param': 'a.flag', "compare": "=", "value": this.flag})
+			cb && cb(pam)
 	    return listPageV2(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	  } catch (error) {
 	    console.log(error)
 	    console.log(error)

+ 2 - 1
src/views/auxiliaryFittings/salesManagement/attachmentOldReturn/index.vue

@@ -80,10 +80,11 @@ export default {
 		this.$refs.pageRef.refreshList()
 		this.$refs.pageRef.refreshList()
 	},
 	},
     // 列表请求函数
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
 	    var pam = JSON.parse(JSON.stringify(p))
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' },{ "param": "a.type", "compare": "=", "value": 'OLD' },{'param': 'a.flag', "compare": "=", "value": this.flag})
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' },{ "param": "a.type", "compare": "=", "value": 'OLD' },{'param': 'a.flag', "compare": "=", "value": this.flag})
+			cb && cb(pam)
 	    return listPageV2(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	  } catch (error) {
 	    console.log(error)
 	    console.log(error)

+ 2 - 1
src/views/auxiliaryFittings/salesManagement/attachmentSalesOrder/index.vue

@@ -81,10 +81,11 @@ export default {
 		this.$refs.pageRef.refreshList()
 		this.$refs.pageRef.refreshList()
 	},
 	},
     // 列表请求函数
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
 	    var pam = JSON.parse(JSON.stringify(p))
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' },{'param': 'a.flag', "compare": "=", "value": this.flag})
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' },{'param': 'a.flag', "compare": "=", "value": this.flag})
+		cb && cb(pam)
 	    return listPageV2(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	  } catch (error) {
 	    console.log(error)
 	    console.log(error)

+ 2 - 1
src/views/auxiliaryFittings/salesManagement/auxiliaryAdjustPriceOrder/index.vue

@@ -80,12 +80,13 @@ export default {
 		this.$refs.pageRef.refreshList()
 		this.$refs.pageRef.refreshList()
 	},
 	},
     // 列表请求函数
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
 	    var pam = JSON.parse(JSON.stringify(p))
 	    if (this.flag) {
 	    if (this.flag) {
 	      pam.params.push({ "param": "a.flag", "compare": "=", "value": this.flag })
 	      pam.params.push({ "param": "a.flag", "compare": "=", "value": this.flag })
 	    }
 	    }
+			cb && cb(pam)
 	    return listPageV2(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	  } catch (error) {
 	    console.log(error)
 	    console.log(error)

+ 2 - 1
src/views/auxiliaryFittings/salesManagement/auxiliarySalesOrder/index.vue

@@ -81,10 +81,11 @@ export default {
 		this.$refs.pageRef.refreshList()
 		this.$refs.pageRef.refreshList()
 	},
 	},
     // 列表请求函数
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
 	    var pam = JSON.parse(JSON.stringify(p))
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' },{'param': 'a.flag', "compare": "=", "value": this.flag})
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' },{'param': 'a.flag', "compare": "=", "value": this.flag})
+		cb && cb(pam)
 	    return listPageV2(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	  } catch (error) {
 	    console.log(error)
 	    console.log(error)

+ 2 - 1
src/views/auxiliaryFittings/salesManagement/auxiliarySalesReturnOrder/index.vue

@@ -80,10 +80,11 @@ export default {
 		this.$refs.pageRef.refreshList()
 		this.$refs.pageRef.refreshList()
 	},
 	},
     // 列表请求函数
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
 	    var pam = JSON.parse(JSON.stringify(p))
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' },{'param': 'a.ret_state', "compare": "=", "value": this.retState})
 	    pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' },{'param': 'a.ret_state', "compare": "=", "value": this.retState})
+			cb && cb(pam)
 	    return listPageV2(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	  } catch (error) {
 	    console.log(error)
 	    console.log(error)

+ 2 - 8
src/views/auxiliaryFittings/settleAccountManagement/settleAccount/index.vue

@@ -74,22 +74,16 @@
 						<td>{{formData.status == 'WAIT'?'待结算':formData.status == 'WAIT_ING'?'可提现':formData.status == 'ING'?'提现中':formData.status == 'OVER'?'已提现':''}}</td>
 						<td>{{formData.status == 'WAIT'?'待结算':formData.status == 'WAIT_ING'?'可提现':formData.status == 'ING'?'提现中':formData.status == 'OVER'?'已提现':''}}</td>
 					</tr>
 					</tr>
 					<tr>
 					<tr>
-						<td class="bold" align="center">微信流水号</td>
-						<td>{{formData.wechatOrder}}</td>
 						<td class="bold" align="center">分账金额</td>
 						<td class="bold" align="center">分账金额</td>
 						<td>{{formData.amount}}</td>
 						<td>{{formData.amount}}</td>
+						<td class="bold" align="center">分账时间</td>
+						<td>{{formData.settlementTime}}</td>
 					</tr>
 					</tr>
 					<tr>
 					<tr>
-						<td class="bold" align="center">手续费</td>
-						<td>{{formData.commissionAmount}}</td>
 						<td class="bold" align="center">师傅分账金额</td>
 						<td class="bold" align="center">师傅分账金额</td>
 						<td>{{formData.workerAmount}}</td>
 						<td>{{formData.workerAmount}}</td>
-					</tr>
-					<tr>
 						<td class="bold" align="center">网点分账金额</td>
 						<td class="bold" align="center">网点分账金额</td>
 						<td>{{formData.websitAmount}}</td>
 						<td>{{formData.websitAmount}}</td>
-						<td class="bold" align="center">分账时间</td>
-						<td>{{formData.settlementTime}}</td>
 					</tr>
 					</tr>
 					<tr>
 					<tr>
 						<td class="bold" align="center">操作人</td>
 						<td class="bold" align="center">操作人</td>

+ 1 - 1
src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -193,7 +193,7 @@
 		<h5>自动结算频率</h5>
 		<h5>自动结算频率</h5>
         <el-form-item label="N等于" prop="dayNum">
         <el-form-item label="N等于" prop="dayNum">
           <el-input v-model="step4Form.dayNum" style="width: 220px;margin-right: 20px;" autocomplete="off" placeholder="请输入天数" type="number"></el-input>
           <el-input v-model="step4Form.dayNum" style="width: 220px;margin-right: 20px;" autocomplete="off" placeholder="请输入天数" type="number"></el-input>
-		  天<span style="color: #EA8000;margin-left: 30px;">将在订单支付成功后T+0天下午17:00 执行一次</span>
+		  天<span style="color: #EA8000;margin-left: 30px;">将在订单支付成功后T+{{step4Form.dayNum}}天{{step4Form.hourTime}}执行一次</span>
         </el-form-item>
         </el-form-item>
 			<el-form-item label="执行时间" prop="hourTime">
 			<el-form-item label="执行时间" prop="hourTime">
 				<el-time-picker v-model="step4Form.hourTime" value-format="HH:mm:ss" placeholder="选择执行时间">
 				<el-time-picker v-model="step4Form.hourTime" value-format="HH:mm:ss" placeholder="选择执行时间">