diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php index 15dc4cd5..efdbd0f7 100644 --- a/admin/controllers/items/Transfer.php +++ b/admin/controllers/items/Transfer.php @@ -468,30 +468,32 @@ class Transfer extends HD_Controller { $info = $this->input->post('info'); $takeCar = $this->input->post('takeCar'); - if (!$info['arti_id']) { - return $this->show_json(SYS_CODE_FAIL, '请选择随车物品'); - } - if (!$takeCar[1]['uid'] && !$takeCar[1]['addr_id']) { - return $this->show_json(SYS_CODE_FAIL, '请选择提车人'); - } - if (!$takeCar[3]['uid'] && !$takeCar[3]['addr_id']) { - return $this->show_json(SYS_CODE_FAIL, '请选择接车人'); - } $trailer_fees = intval($info['trailer_fees']); - if ($trailer_fees) { - if (!$info['fees_city']) { - return $this->show_json(SYS_CODE_FAIL, '请选择费用承担城市'); + if ($info['status'] != -1) {//提交判断 + if (!$info['arti_id']) { + return $this->show_json(SYS_CODE_FAIL, '请选择随车物品'); } - if ($info['fees_type'] == 1 && !$info['fees_biz_id']) { - return $this->show_json(SYS_CODE_FAIL, '请选择费用承担门店'); + if (!$takeCar[1]['uid'] && !$takeCar[1]['addr_id']) { + return $this->show_json(SYS_CODE_FAIL, '请选择提车人'); + } + if (!$takeCar[3]['uid'] && !$takeCar[3]['addr_id']) { + return $this->show_json(SYS_CODE_FAIL, '请选择接车人'); + } + if ($trailer_fees) { + if (!$info['fees_city']) { + return $this->show_json(SYS_CODE_FAIL, '请选择费用承担城市'); + } + if ($info['fees_type'] == 1 && !$info['fees_biz_id']) { + return $this->show_json(SYS_CODE_FAIL, '请选择费用承担门店'); + } + } + if (!$info['transport']['name'] || !$info['transport']['mobile'] || !$info['transport']['cardid']) { + return $this->show_json(SYS_CODE_FAIL, '请输入运输人员姓名/电话/身份证号'); } - } - if (!$info['transport']['name'] || !$info['transport']['mobile'] || !$info['transport']['cardid']) { - return $this->show_json(SYS_CODE_FAIL, '请输入运输人员姓名/电话/身份证号'); } $re = $this->mdTransfer->get(['item_id' => $info['item_id'], 'status in(0,1)' => null]); if ($re) { - return $this->show_json(SYS_CODE_FAIL, '添加失败,车辆正在调拨中...'); + return $this->show_json(SYS_CODE_FAIL, '操作失败,车辆正在调拨中...'); } $jsondata['transport'] = $info['transport'];//运输人员 $jsondata['reason'] = $info['reason'];//调拨理由 @@ -531,7 +533,7 @@ class Transfer extends HD_Controller 'trailer_fees' => $trailer_fees, 'fees_type' => intval($info['fees_type']), 'fees_city' => intval($info['fees_city']), - 'fees_biz_id' => $info['fees_biz_id'], + 'fees_biz_id' => intval($info['fees_biz_id']), 'out_type' => $takeCar[1]['type'], 'in_type' => $takeCar[3]['type'], 'status' => intval($info['status']) diff --git a/common/models/biz/Biz_base_model.php b/common/models/biz/Biz_base_model.php index d43d53ec..78d09451 100644 --- a/common/models/biz/Biz_base_model.php +++ b/common/models/biz/Biz_base_model.php @@ -20,7 +20,8 @@ class Biz_base_model extends HD_Model $field['company'] = ['title' => '公司名称', 'type' => 'input', 'input_type' => 'text', 'value' => '']; $field['county'] = ['title' => '县区', 'type' => 'select', 'list' => [0 => '选择县区'], 'value' => '']; $field['street'] = ['title' => '乡镇', 'type' => 'select', 'list' => [0 => '选择乡镇'], 'value' => '']; - $field['type'] = ['title' => '类型', 'type' => 'select', 'list' => [0 => '选择类型', 1 => '品牌店', 2 => '形象店', 3 => '代理店'], 'value' => '']; + $field['type'] = ['title' => '类型', 'type' => 'select', 'list' => [0 => '选择类型', 1 => '品牌店', 2 => '形象店' + , 3 => '代理店', 4 => '合作店'], 'value' => '']; $field['level'] = ['title' => '级别', 'type' => 'text', 'value' => '']; $field['lead'] = ['title' => '负责人', 'type' => 'select', 'list' => [0 => '选择负责人'], 'value' => '']; $field['douyin'] = ['title' => '抖音号', 'type' => 'input', 'input_type' => 'text', 'value' => ''];