|
@@ -121,12 +121,12 @@
|
|
<view style="width: 100%;position: fixed;
|
|
<view style="width: 100%;position: fixed;
|
|
bottom: 0;background-color: #fff;border-top: 1rpx solid #ccc;">
|
|
bottom: 0;background-color: #fff;border-top: 1rpx solid #ccc;">
|
|
<view style="width: 100%;display: flex;font-size: 24rpx;">
|
|
<view style="width: 100%;display: flex;font-size: 24rpx;">
|
|
- <view @click="revokeCheckOrderRWfun" v-if="form.taskWhetherAdopt == '审核提交'" style="width: 100%; padding: 10rpx 0;
|
|
|
|
|
|
+ <view @click="revokeCheckOrderRWfun" v-if="form.taskWhetherAdopt == '审核提交'" style="width: 100%; padding: 10rpx 0;
|
|
background-color: #d2983c;display: grid;justify-items: center;">
|
|
background-color: #d2983c;display: grid;justify-items: center;">
|
|
<u-icon name="edit-pen" color="#fff"></u-icon>
|
|
<u-icon name="edit-pen" color="#fff"></u-icon>
|
|
<view style="color: #fff;">撤销出库任务审批</view>
|
|
<view style="color: #fff;">撤销出库任务审批</view>
|
|
</view>
|
|
</view>
|
|
- <view @click="orderRevokeGenerateShipTaskfun" v-else-if="form.generateTask == '已生成'" style="width: 100%; padding: 10rpx 0;
|
|
|
|
|
|
+ <view @click="orderRevokeGenerateShipTaskfun" v-else-if="form.generateTask == '已生成'" style="width: 100%; padding: 10rpx 0;
|
|
background-color: #d2983c;display: grid;justify-items: center;">
|
|
background-color: #d2983c;display: grid;justify-items: center;">
|
|
<u-icon name="edit-pen" color="#fff"></u-icon>
|
|
<u-icon name="edit-pen" color="#fff"></u-icon>
|
|
<view style="color: #fff;">撤销任务</view>
|
|
<view style="color: #fff;">撤销任务</view>
|
|
@@ -195,7 +195,7 @@
|
|
font-size: 32rpx;">
|
|
font-size: 32rpx;">
|
|
<view style="display: flex; color: #fff;justify-content: space-around;">
|
|
<view style="display: flex; color: #fff;justify-content: space-around;">
|
|
<view style="color: #FD4B09; border: 1rpx solid #FD4B09;
|
|
<view style="color: #FD4B09; border: 1rpx solid #FD4B09;
|
|
- width: 200rpx; height: 80rpx;
|
|
|
|
|
|
+ width: 200rpx; height: 80rpx;
|
|
line-height: 80rpx; border-radius: 12rpx;" @click="popupShow = false">取消</view>
|
|
line-height: 80rpx; border-radius: 12rpx;" @click="popupShow = false">取消</view>
|
|
<view
|
|
<view
|
|
style="background-color: #FF6F3B; width: 200rpx; height: 80rpx; line-height: 80rpx; border-radius: 12rpx;"
|
|
style="background-color: #FF6F3B; width: 200rpx; height: 80rpx; line-height: 80rpx; border-radius: 12rpx;"
|
|
@@ -801,7 +801,7 @@
|
|
},
|
|
},
|
|
//集合筛选条件
|
|
//集合筛选条件
|
|
filterAll(screen) {
|
|
filterAll(screen) {
|
|
- // if (this.form.status != '录入') return
|
|
|
|
|
|
+ // if (this.form.status != '录入') return
|
|
if (this.form.generateTask != '未生成') return
|
|
if (this.form.generateTask != '未生成') return
|
|
this.screen = screen
|
|
this.screen = screen
|
|
switch (screen[1]) {
|
|
switch (screen[1]) {
|
|
@@ -1023,7 +1023,7 @@
|
|
}).then(res => {
|
|
}).then(res => {
|
|
if (res.data == 1) {
|
|
if (res.data == 1) {
|
|
if (!this.form.storageId) {
|
|
if (!this.form.storageId) {
|
|
- return this.$refs.uNotify.show({
|
|
|
|
|
|
+ return this.$refs.uToast.show({
|
|
top: this.revenueTop,
|
|
top: this.revenueTop,
|
|
type: 'warning',
|
|
type: 'warning',
|
|
message: '请选择发货仓库!'
|
|
message: '请选择发货仓库!'
|
|
@@ -1239,7 +1239,7 @@
|
|
},
|
|
},
|
|
// 产品跳转
|
|
// 产品跳转
|
|
chanpintiao() {
|
|
chanpintiao() {
|
|
- if (!this.form.customerId) return this.$refs.uNotify.show({
|
|
|
|
|
|
+ if (!this.form.customerId) return this.$refs.uToast.show({
|
|
top: this.revenueTop,
|
|
top: this.revenueTop,
|
|
type: 'warning',
|
|
type: 'warning',
|
|
message: '请选择客户!'
|
|
message: '请选择客户!'
|
|
@@ -1251,7 +1251,7 @@
|
|
corpId: this.form.corpId
|
|
corpId: this.form.corpId
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
- this.$refs.uNotify.show({
|
|
|
|
|
|
+ this.$refs.uToast.show({
|
|
top: this.revenueTop,
|
|
top: this.revenueTop,
|
|
type: 'warning',
|
|
type: 'warning',
|
|
message: '请选择发货仓库!'
|
|
message: '请选择发货仓库!'
|
|
@@ -1292,7 +1292,7 @@
|
|
},
|
|
},
|
|
|
|
|
|
selectCustomer() {
|
|
selectCustomer() {
|
|
- // if (this.form.status != '录入') return
|
|
|
|
|
|
+ // if (this.form.status != '录入') return
|
|
if (this.form.generateTask != '未生成') return
|
|
if (this.form.generateTask != '未生成') return
|
|
this.$u.route('/pages/views/salesSlip/selectCustomer', {
|
|
this.$u.route('/pages/views/salesSlip/selectCustomer', {
|
|
corpType: 'KH'
|
|
corpType: 'KH'
|
|
@@ -1335,4 +1335,4 @@
|
|
right: 15rpx;
|
|
right: 15rpx;
|
|
color: #fd4b09;
|
|
color: #fd4b09;
|
|
}
|
|
}
|
|
-</style>
|
|
|
|
|
|
+</style>
|