admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

transfer status=2 can edit fees and transport

Browse Source
This commit is contained in:
qianhy
2022-12-21 10:49:12 +08:00
committed by lccsw
parent 9f0ff2682d
commit f840397ff3
3 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/items/Transfer.php
+31 -23
View File
@@ -413,9 +413,10 @@ class Transfer extends HD_Controller
if (!$re || empty($re)) {
return $this->show_json(SYS_CODE_FAIL, '车辆调拨不存在！');
}
if ($re['status'] == 2) {
// 2022.12.20 原来 确认接车 的状态 不能再修改调拨单，现在需要把这个限制去掉，所有状态都允许修改
/*if ($re['status'] == 2) {
return $this->show_json(SYS_CODE_FAIL, '车辆已调拨完成,不能修改！');
}
}*/
$item_id = $re['item_id'] ? $re['item_id'] : 0;
$re_items = $this->mdItems->get(['id' => $item_id]);
$jsondata = $re['jsondata'] ? json_decode($re['jsondata'], true) : [];
@@ -529,6 +530,7 @@ class Transfer extends HD_Controller
$trailer_fees = intval($info['trailer_fees']);
$remind = $info['remind'];//1提交
$db_status = -1;
$db_status_not2_flag = true;
if ($info['id']) {//修改调拨
$re_t = $this->mdTransfer->get(array('id' => $info['id']));
if (!$re_t || empty($re_t)) {
@@ -536,12 +538,14 @@ class Transfer extends HD_Controller
}
$db_status = $re_t['status'];
if ($db_status == 2) {
return $this->show_json(SYS_CODE_FAIL, '车辆已完成调拨,不能修改！');
$db_status_not2_flag = false; // 2022.12.20 “确认接车”状态的数据，修改提交后:不改状态，不发短信
#return $this->show_json(SYS_CODE_FAIL, '车辆已完成调拨,不能修改！');
}
}
if ($remind && $db_status == -1) {//提交且状态为-1时，状态设为0调拨
$db_status = 0;
}
!$db_status_not2_flag && $db_status = 2; // 2022.12.20 “确认接车”状态的数据，修改提交后:不改状态，不发短信
if ($remind == 1) {//提交时加判断
if (!$info['arti_id']) {
return $this->show_json(SYS_CODE_FAIL, '请选择随车物品');
@@ -681,22 +685,13 @@ class Transfer extends HD_Controller
$this->mdTransferRemind->delete(['tran_id' => $id, 'type' => 2]);//删除已有备用提车人
}
}
//接车人
$results = $this->edit_remind_admin(['type' => 3, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[3]);
if ($results['add'] == 1) {
if ($takeCar[3]['type'] == 2) {
$results['uid'] && $send_admins[] = $results['uid'];
$addAdmin[] = $results['addDate'];
} else {
$results['uid'] && $send_uids[] = $results['uid'];
$addRemind[] = $results['addDate'];
}
}
//备用接车人
if ($info['in_bak'] == 1) {
$results = $this->edit_remind_admin(['type' => 4, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[4]);
// 2022.12.20 “确认接车”状态的数据，修改提交后:不改状态，不发短信
if ($db_status_not2_flag){
//接车人
$results = $this->edit_remind_admin(['type' => 3, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[3]);
if ($results['add'] == 1) {
if ($takeCar[4]['type'] == 2) {
if ($takeCar[3]['type'] == 2) {
$results['uid'] && $send_admins[] = $results['uid'];
$addAdmin[] = $results['addDate'];
} else {
@@ -704,9 +699,22 @@ class Transfer extends HD_Controller
$addRemind[] = $results['addDate'];
}
}
} else {
$this->mdTransferAdmin->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人
$this->mdTransferRemind->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人
//备用接车人
if ($info['in_bak'] == 1) {
$results = $this->edit_remind_admin(['type' => 4, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[4]);
if ($results['add'] == 1) {
if ($takeCar[4]['type'] == 2) {
$results['uid'] && $send_admins[] = $results['uid'];
$addAdmin[] = $results['addDate'];
} else {
$results['uid'] && $send_uids[] = $results['uid'];
$addRemind[] = $results['addDate'];
}
}
} else {
$this->mdTransferAdmin->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人
$this->mdTransferRemind->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人
}
}
} else {//新增提车人/接车人
//提车人
@@ -750,9 +758,9 @@ class Transfer extends HD_Controller
}
$item_info = $this->input->post('items_info');
//门店调拨短信提醒
$this->send_alisms(['uids' => $send_uids, 'type' => 1, 'item_info' => $item_info, 'tran_id' => $id]);
$db_status_not2_flag && $this->send_alisms(['uids' => $send_uids, 'type' => 1, 'item_info' => $item_info, 'tran_id' => $id]);
//信息员调拨短信提醒
$this->send_alisms(['uids' => $send_admins, 'type' => 2, 'item_info' => $item_info]);
$db_status_not2_flag && $this->send_alisms(['uids' => $send_admins, 'type' => 2, 'item_info' => $item_info]);
return $this->show_json(SYS_CODE_SUCCESS, '提交成功', "/items/transfer");
}
admin/views/items/transfer/get_add.php
+31 -31
View File
@@ -46,7 +46,7 @@
<div class="am-para-input">
<div class="am-g">
<label class="mr10" style="margin-top: 7px" v-for="(v,i) in auto_article">
<input type="checkbox" :value="v.id" v-model="info.arti_id"/> {{v.title}}
<input type="checkbox" :value="v.id" v-model="info.arti_id" v-bind:disabled="info.status==2"/> {{v.title}}
</label>
</div>
</div>
@@ -63,25 +63,25 @@
<div class="am-form-group">
<label class="am-para-label w100">提车人：</label>
<div class="am-para-inline w120">
<select v-model="takeCar1.city_id">
<select v-model="takeCar1.city_id" :disabled="info.status==2">
<option value="">选择城市</option>
<option :value="v.id" v-for="(v,i) in takeCar1.cityList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar1.county_id">
<select v-model="takeCar1.county_id" :disabled="info.status==2">
<option value="">选择行政区</option>
<option :value="v.id" v-for="(v,i) in takeCar1.countyList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar1.type">
<select v-model="takeCar1.type" :disabled="info.status==2">
<option :value="i" v-for="(v,i) in showInfo.uidTypeAry">{{v}}</option>
</select>
</div>
<div v-if="takeCar1.type==2">
<div class="am-para-inline w210">
<select v-model="takeCar1.admin_id">
<select v-model="takeCar1.admin_id" :disabled="info.status==2">
<option value="">选择信息员</option>
<template v-for="(v,i) in takeCar1.adminList">
<option :value="v.id">{{v.title}}</option>
@@ -89,7 +89,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar1.addr_id">
<select v-model="takeCar1.addr_id" :disabled="info.status==2">
<option value="">选择存放地</option>
<template v-for="(v,i) in takeCar1.addrList">
<option :value="v.id">{{v.title}}</option>
@@ -99,7 +99,7 @@
</div>
<div v-else>
<div class="am-para-inline w210">
<select v-model="takeCar1.biz_id">
<select v-model="takeCar1.biz_id" :disabled="info.status==2">
<option value="">选择门店</option>
<template v-for="(v,i) in takeCar1.bizList">
<option :value="v.id">{{v.title}}</option>
@@ -107,7 +107,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar1.uid">
<select v-model="takeCar1.uid" :disabled="info.status==2">
<option value="">提车人</option>
<template v-for="(v,i) in takeCar1.uidList">
<option :value="v.id">{{v.title}}</option>
@@ -116,7 +116,7 @@
</div>
</div>
<div class="am-para-inline ml20" style="padding-top: 3px;">
<button type="button" class="am-btn am-btn-default am-btn-sm" @click='addBak("out");'>
<button type="button" class="am-btn am-btn-default am-btn-sm" @click='addBak("out");' :disabled="info.status==2">
{{info.out_bak?'删除备用提车人':'添加备用提车人'}}
</button>
</div>
@@ -124,25 +124,25 @@
<div class="am-form-group" v-if="info.out_bak">
<label class="am-para-label w100">备用提车人：</label>
<div class="am-para-inline w120">
<select v-model="takeCar2.city_id">
<select v-model="takeCar2.city_id" :disabled="info.status==2">
<option value="">选择城市</option>
<option :value="v.id" v-for="(v,i) in takeCar2.cityList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar2.county_id">
<select v-model="takeCar2.county_id" :disabled="info.status==2">
<option value="">选择行政区</option>
<option :value="v.id" v-for="(v,i) in takeCar2.countyList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar2.type">
<select v-model="takeCar2.type" :disabled="info.status==2">
<option :value="i" v-for="(v,i) in showInfo.uidTypeAry">{{v}}</option>
</select>
</div>
<div v-if="takeCar2.type==2">
<div class="am-para-inline w210">
<select v-model="takeCar2.admin_id">
<select v-model="takeCar2.admin_id" :disabled="info.status==2">
<option value="">选择信息员</option>
<template v-for="(v,i) in takeCar2.adminList">
<option :value="v.id">{{v.title}}</option>
@@ -150,7 +150,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar2.addr_id">
<select v-model="takeCar2.addr_id" :disabled="info.status==2">
<option value="">选择存放地</option>
<template v-for="(v,i) in takeCar2.addrList">
<option :value="v.id">{{v.title}}</option>
@@ -160,7 +160,7 @@
</div>
<div v-else>
<div class="am-para-inline w210">
<select v-model="takeCar2.biz_id">
<select v-model="takeCar2.biz_id" :disabled="info.status==2">
<option value="">选择门店</option>
<template v-for="(v,i) in takeCar2.bizList">
<option :value="v.id">{{v.title}}</option>
@@ -168,7 +168,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar2.uid">
<select v-model="takeCar2.uid" :disabled="info.status==2">
<option value="">备用提车人</option>
<template v-for="(v,i) in takeCar2.uidList">
<option :value="v.id">{{v.title}}</option>
@@ -181,25 +181,25 @@
<div class="am-form-group">
<label class="am-para-label w100">接车人：</label>
<div class="am-para-inline w120">
<select v-model="takeCar3.city_id">
<select v-model="takeCar3.city_id" :disabled="info.status==2">
<option value="">选择城市</option>
<option :value="v.id" v-for="(v,i) in takeCar3.cityList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar3.county_id">
<select v-model="takeCar3.county_id" :disabled="info.status==2">
<option value="">选择行政区</option>
<option :value="v.id" v-for="(v,i) in takeCar3.countyList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar3.type">
<select v-model="takeCar3.type" :disabled="info.status==2">
<option :value="i" v-for="(v,i) in showInfo.uidTypeAry">{{v}}</option>
</select>
</div>
<div v-if="takeCar3.type==2">
<div class="am-para-inline w210">
<select v-model="takeCar3.admin_id">
<select v-model="takeCar3.admin_id" :disabled="info.status==2">
<option value="">选择信息员</option>
<template v-for="(v,i) in takeCar3.adminList">
<option :value="v.id">{{v.title}}</option>
@@ -207,7 +207,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar3.addr_id">
<select v-model="takeCar3.addr_id" :disabled="info.status==2">
<option value="">选择存放地</option>
<template v-for="(v,i) in takeCar3.addrList">
<option :value="v.id">{{v.title}}</option>
@@ -217,7 +217,7 @@
</div>
<div v-else>
<div class="am-para-inline w210">
<select v-model="takeCar3.biz_id">
<select v-model="takeCar3.biz_id" :disabled="info.status==2">
<option value="">选择门店</option>
<template v-for="(v,i) in takeCar3.bizList">
<option :value="v.id">{{v.title}}</option>
@@ -225,7 +225,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar3.uid">
<select v-model="takeCar3.uid" :disabled="info.status==2">
<option value="">接车人</option>
<template v-for="(v,i) in takeCar3.uidList">
<option :value="v.id">{{v.title}}</option>
@@ -234,7 +234,7 @@
</div>
</div>
<div class="am-para-inline ml20" style="padding-top: 3px;">
<button type="button" class="am-btn am-btn-default am-btn-sm" @click='addBak("in");'>
<button type="button" class="am-btn am-btn-default am-btn-sm" @click='addBak("in");' :disabled="info.status==2">
{{info.in_bak?'删除备用接车人':'添加备用接车人'}}
</button>
</div>
@@ -242,25 +242,25 @@
<div class="am-form-group" v-if="info.in_bak">
<label class="am-para-label w100">备用接车人：</label>
<div class="am-para-inline w120">
<select v-model="takeCar4.city_id">
<select v-model="takeCar4.city_id" :disabled="info.status==2">
<option value="">选择城市</option>
<option :value="v.id" v-for="(v,i) in takeCar4.cityList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar4.county_id">
<select v-model="takeCar4.county_id" :disabled="info.status==2">
<option value="">选择行政区</option>
<option :value="v.id" v-for="(v,i) in takeCar4.countyList">{{v.name}}</option>
</select>
</div>
<div class="am-para-inline w120">
<select v-model="takeCar4.type">
<select v-model="takeCar4.type" :disabled="info.status==2">
<option :value="i" v-for="(v,i) in showInfo.uidTypeAry">{{v}}</option>
</select>
</div>
<div v-if="takeCar4.type==2">
<div class="am-para-inline w210">
<select v-model="takeCar4.admin_id">
<select v-model="takeCar4.admin_id" :disabled="info.status==2">
<option value="">选择信息员</option>
<template v-for="(v,i) in takeCar4.adminList">
<option :value="v.id">{{v.title}}</option>
@@ -268,7 +268,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar4.addr_id">
<select v-model="takeCar4.addr_id" :disabled="info.status==2">
<option value="">选择存放地</option>
<template v-for="(v,i) in takeCar4.addrList">
<option :value="v.id">{{v.title}}</option>
@@ -278,7 +278,7 @@
</div>
<div v-else>
<div class="am-para-inline w210">
<select v-model="takeCar4.biz_id">
<select v-model="takeCar4.biz_id" :disabled="info.status==2">
<option value="">选择门店</option>
<template v-for="(v,i) in takeCar4.bizList">
<option :value="v.id">{{v.title}}</option>
@@ -286,7 +286,7 @@
</select>
</div>
<div class="am-para-inline w210">
<select v-model="takeCar4.uid">
<select v-model="takeCar4.uid" :disabled="info.status==2">
<option value="">备用接车人</option>
<template v-for="(v,i) in takeCar4.uidList">
<option :value="v.id">{{v.title}}</option>
admin/views/items/transfer/lists.php
+2
View File
@@ -274,6 +274,8 @@
<? if ($v['status'] == 2) { ?>
<a href="javascript:void(0);" data-open="items/transfer/get?id=<?= $v['id'] ?>"
>详情</a>
<a href="javascript:void(0);" data-open="items/transfer/get_edit?id=<?= $v['id'] ?>"
>修改</a>
<? } else { ?>
<? if ($v['status'] != -1) { ?>
<a href="javascript:void(0);" data-open="items/transfer/get?id=<?= $v['id'] ?>"