From dfb3a8b771de04b4e9c4ffc6481d9fbacc002dbf Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 29 Apr 2024 17:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/aftersalesWorkOrderAddTemp.vue | 91 +++++++++++-------- .../checkInventoryTask/createTask.vue | 11 ++- 2 files changed, 61 insertions(+), 41 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderAddTemp.vue b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue index 3c7f8158..5c76d0ff 100644 --- a/src/views/aftersales/aftersalesWorkOrderAddTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue @@ -271,15 +271,15 @@ v-model="form.processor" placeholder="请选择处理方" style="width: 100%" + multiple + filterable + clearable > @@ -293,6 +293,8 @@ @@ -300,6 +302,18 @@ + + + + + + + @@ -348,6 +362,7 @@ import { deepClone } from '@/utils/util'; const form = ref({ TabactiveName: '0', //工单类型菜单 activPackage: '0', //包件信息菜单 + responsibilities:'0',//内部责任菜单 Pageloading: false, //页面加载 Packageloading: false, //包件加载 historydialog: false, //历史包件弹窗 @@ -366,27 +381,31 @@ const form = ref({ }, ], //历史包件列表 Historicalpackage: [], +// 内部责任划分 + responsibilitiesList:[ + + ], }); const ruleForm = reactive({ - workOrderType: [{ required: true, message: '请选择异常类型', trigger: 'change' }], - discoveryNode: [{ required: true, message: '请选择发现节点', trigger: 'change' }], - packageCode: [{ required: true, message: '请输入包条码', trigger: 'change' }], - waybillNumber: [{ required: true, message: '请输入运单号', trigger: 'change' }], - orderCode: [{ required: true, message: '请输入订单自编号', trigger: 'change' }], - first: [{ required: true, message: '请输入一级品', trigger: 'change' }], - secondary: [{ required: true, message: '请输入二级品', trigger: 'change' }], - brandName: [{ required: true, message: '请输入品牌', trigger: 'change' }], - trainNumber: [{ required: true, message: '请选择车次号', trigger: 'change' }], - deliveryTime: [{ required: true, message: '请输入配送时间', trigger: 'change' }], - deliveryDriver: [{ required: true, message: '请输入配送司机', trigger: 'change' }], - vehicleRoute: [{ required: true, message: '请输入车辆线路', trigger: 'change' }], - deliverGoodsTime: [{ required: true, message: '请输入发货时间', trigger: 'change' }], - warehousingTime: [{ required: true, message: '请选择入库时间', trigger: 'change' }], - discoveryTime: [{ required: true, message: '请选择发现时间', trigger: 'change' }], - waybillMall: [{ required: true, message: '请输入运单商场', trigger: 'change' }], - typeServiceName: [{ required: true, message: '请输入合作模式', trigger: 'change' }], - processor: [{ required: true, message: '请输入处理方', trigger: 'change' }], - investigationPocess: [{ required: true, message: '请输入调查经过', trigger: 'change' }], + workOrderType: [{ required: true, message: '请选择异常类型', trigger: 'bulr' }], + discoveryNode: [{ required: true, message: '请选择发现节点', trigger: 'bulr' }], + packageCode: [{ required: true, message: '请输入包条码', trigger: 'bulr' }], + waybillNumber: [{ required: true, message: '请输入运单号', trigger: 'bulr' }], + orderCode: [{ required: true, message: '请输入订单自编号', trigger: 'bulr' }], + first: [{ required: true, message: '请输入一级品', trigger: 'bulr' }], + secondary: [{ required: true, message: '请输入二级品', trigger: 'bulr' }], + brandName: [{ required: true, message: '请输入品牌', trigger: 'bulr' }], + trainNumber: [{ required: true, message: '请选择车次号', trigger: 'bulr' }], + deliveryTime: [{ required: true, message: '请输入配送时间', trigger: 'bulr' }], + deliveryDriver: [{ required: true, message: '请输入配送司机', trigger: 'bulr' }], + vehicleRoute: [{ required: true, message: '请输入车辆线路', trigger: 'bulr' }], + deliverGoodsTime: [{ required: true, message: '请输入发货时间', trigger: 'bulr' }], + warehousingTime: [{ required: true, message: '请选择入库时间', trigger: 'bulr' }], + discoveryTime: [{ required: true, message: '请选择发现时间', trigger: 'bulr' }], + waybillMall: [{ required: true, message: '请输入运单商场', trigger: 'bulr' }], + typeServiceName: [{ required: true, message: '请输入合作模式', trigger: 'bulr' }], + processor: [{ required: true, message: '请输入处理方', trigger: 'bulr' }], + investigationPocess: [{ required: true, message: '请输入调查经过', trigger: 'bulr' }], }); const ruleFormRef = ref(); //表单示例 // 异常类型 @@ -447,20 +466,18 @@ const DiscoveringNodesChange = value => { }; // 菜单切换显示输入框 const displaySettings = computed(() => { - const groundType = form.value.groundlineType; - const includesType = types => types.includes(groundType); return { - trainNumber: includesType([3, 5, 7, 6]), // 车次号 - deliveryTime: includesType([5, 7, 6]), // 配送时间 - deliveryDriver: includesType([5, 7, 6]), // 配送司机 - vehicleRoute: includesType([3]), // 车辆线路 - deliverGoodsTime: includesType([2]), // 发货时间 - warehousingTime: includesType([4]), // 入库时间 - discoveryTime: includesType([4, 5, 6, 7]), // 发现时间 - waybillMall: true, // 运单商场 - typeServiceName: true, // 合作模式 - processor: true, // 处理方 - investigationPocess: true, // 调查经过 + trainNumber: ['3', '5', '7', '6'].includes(form.value.groundlineType), //车次号 + deliveryTime: ['5', '7', '6'].includes(form.value.groundlineType), //配送时间 + deliveryDriver: ['5', '7', '6'].includes(form.value.groundlineType), //配送司机 + vehicleRoute: ['3'].includes(form.value.groundlineType), //车辆线路 + deliverGoodsTime: ['2'].includes(form.value.groundlineType), //发货时间 + warehousingTime: ['4'].includes(form.value.groundlineType), //入库时间 + discoveryTime: ['4', '5', '6', '7'].includes(form.value.groundlineType), //发现时间 + waybillMall: true, //运单商场 + typeServiceName: true, //合作模式 + processor: true, //处理方 + investigationPocess: true, //调查经过 }; }); // 新增包件 @@ -635,7 +652,6 @@ const TabactiveClick = (a, b) => { width: 12.8%; margin-right: 10px; .el-form-item__content { - height: 29px; .el-input { height: 100% !important; .el-input__wrapper { @@ -650,8 +666,9 @@ const TabactiveClick = (a, b) => { .el_Basic { flex: 1; display: flex; + min-width: 20%; .el_Processing { - width: 54%; + width: 39.6%; } .el_Investigation { flex: 1; diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index 1e7546e5..4375aa07 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -715,6 +715,7 @@ import { downloadXls } from '@/utils/util'; import { getDictionaryBiz } from '@/api/system/dict'; import { ref, reactive } from 'vue'; import { off } from 'dom7'; +import { template } from '@antfu/utils'; const wLinput = ref(null); //物料编码搜索框 const wLinputState = ref(false); //标记是否显示下拉框 const SoInfoData = ref({}); //搜索框参数 @@ -770,6 +771,7 @@ const Statusjudgment = ref(false); //新增按钮 const DbEx = ref(null); //对比明细导出 const fullScreen = ref(false); //是否全屏 const BatchAbandonment = ref([]); //首页废弃 +const templateRwo = ref() /** loading */ const loadingObj = reactive({ /** 页面loading */ @@ -1590,17 +1592,16 @@ const InInputSo = (values, val) => { // 搜索框 const InputSo = val => { + console.log(val,'val==>'); TcPdloading.value = true; - console.log(val, '搜索框接收的值'); - console.log( UncountedDetails.value,' UncountedDetails.value'); let data = {}; console.log(row.value, 'row.value'); data.current = TccurrentPage.value; data.size = TcpageSize.value; let dataS = { - questNum: UncountedDetails.value?UncountedDetails.value.questNum:'', - questId: UncountedDetails.value?UncountedDetails.value.id:'', + questNum: templateRwo.value.questNum, + questId: templateRwo.value.id, current: TccurrentPage.value, //页码 size: TcpageSize.value, //条数 [val.prop]: val.values, @@ -1842,6 +1843,8 @@ const TcViewEvent = (val, Inso) => { }; // 点击详情按钮 const ViewEvent = val => { + console.log(val,'val'); + templateRwo.value =val DiskStatus.value = true; //表示当前在已盘点列表 InventoryDetails.value.forEach(item => { item.values = null;