From 56be5e617f4b5ed52368dbf3a5d4e28963e1b328 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 4 Mar 2024 14:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E7=AE=A1=E7=90=86=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 4 +- .../aftersales/aftersalesWorkOrderAdd.vue | 81 +- .../basicdata/brand/basicZonePriceFrom.vue | 765 ++++++++++-------- .../signfor/distributionSignfor.vue | 12 +- 4 files changed, 483 insertions(+), 379 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 5ea23b4d..1bbc08bb 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1232,9 +1232,9 @@ const AppealStatusT = ref(false); //是否为申诉列表 const loadingCustomer = ref(false); //客服介入弹窗加载 const TabList = ref([ { name: 0, label: '全部', state: true, request: true, DataList: [], total: '' }, - { name: 3, label: '待处理', state: true, request: true, DataList: [], total: '' }, - { name: 9, label: '待审核', state: true, request: true, DataList: [], total: '' }, { name: 8, label: '待回复', state: false, request: true, DataList: [], total: '' }, + { name: 3, label: '待处理(新建)', state: true, request: true, DataList: [], total: '' }, + { name: 9, label: '待审核', state: true, request: true, DataList: [], total: '' }, { name: 1, label: '处理中', state: true, request: true, DataList: [], total: '' }, { name: 2, label: '处理完毕', state: true, request: true, DataList: [], total: '' }, { name: 6, label: '仲裁中', state: true, request: true, DataList: [], total: '' }, diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 6fce2404..14fd0ede 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -99,16 +99,27 @@ placement="top" > +
+ + + +
+ +
+ + + +
+
@@ -253,13 +264,13 @@ /> - + + + - + + + + + @@ -323,13 +337,14 @@ v-model="Indexform.investigationPocess" placeholder="请输入调查经过" clearable - :rows="5" + :rows="1" type="textarea" /> - - - + + + +
@@ -359,6 +374,7 @@ v-else v-model="item.businessName" filterable + clearable placeholder="请选择责任方" @change="ResponsiblePartychange(item.businessName, index)" > @@ -418,9 +434,9 @@
-
+
- +
@@ -698,7 +714,7 @@ const Paymentmethod = ref([]); //支付方式 const Mydata = ref(); //当前登录人信息 const PackageInfo = ref([ //包件信息 - { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false }, + { packageCode: '', orderCode: '',first:'',secondary:'', waybillNumber: '', brandName: '', state: false }, ]); // 责任方列表 const FangAddList = ref([ @@ -799,6 +815,9 @@ const handle = () => { // 获取当前责任方的责任人 const ResponsiblePartychange = (val, index) => { + if(!val){ + return + } FangAddList.value[index].personResponsibleName = null; //清空当前选择的责任人 $_getBusinessDepartmentUser({ warehouseId: val, @@ -1124,8 +1143,8 @@ const rules = reactive({ vehicleRoute: [{ required: true, message: '请填写车辆线路', trigger: 'blur' }], deliverGoodsTime: [{ required: true, message: '请填写发货时间', trigger: 'blur' }], discoveryTime: [{ required: true, message: '请填写发现时间', trigger: 'blur' }], - first: [{ required: true, message: '请填写一级品', trigger: 'blur' }], - secondary: [{ required: true, message: '请填写二级品', trigger: 'blur' }], + // first: [{ required: true, message: '请填写一级品', trigger: 'blur' }], + // secondary: [{ required: true, message: '请填写二级品', trigger: 'blur' }], warehousingTime: [{ required: true, message: '请填写入库时间', trigger: 'blur' }], processor: [{ required: true, message: '请填选择处理方', trigger: 'blur' }], waybillMall: [{ required: true, message: '请填写运单商场', trigger: 'blur' }], @@ -1738,11 +1757,17 @@ const ViewPackageDetails = val => { // 对调查经过输入框进行处理 const isShowFormItem1 = computed(() => { - return !['1', '2', '5', '6', '7'].includes(groundlineType.value); + return ['2'].includes(groundlineType.value); }); // 对调查经过输入框进行处理 const isShowFormItem2 = computed(() => { - return !['2', '5', '6', '7', '8'].includes(groundlineType.value); + return ['2'].includes(groundlineType.value); +}); +const isShowFormItem3 = computed(() => { + return ['3','4','5','6','7'].includes(groundlineType.value); +}); +const isShowFormItem4 = computed(() => { + return ['5','6','7'].includes(groundlineType.value); }); @@ -1753,7 +1778,6 @@ const isShowFormItem2 = computed(() => { justify-content: flex-start; border: 1px solid #ccc; .el-form-item { - height: 46px; display: flex; align-items: center; margin: 0; @@ -1880,12 +1904,19 @@ const isShowFormItem2 = computed(() => { } } .ResponsibilityBox { + :deep(.asterisk-left){ + .el-form-item__label{ + width: auto !important; + } + } + width: 100%; display: flex; flex-direction: column; .leftbox { display: flex; justify-content: space-between; + width: 100%; .el_zb { width: 140px; margin-right: 50px; @@ -1901,6 +1932,9 @@ const isShowFormItem2 = computed(() => { flex-wrap: nowrap; } } + .illustrate{ + width: 50%; + } } .maxBox { display: flex; @@ -2139,9 +2173,8 @@ const isShowFormItem2 = computed(() => { .Investigationprocess { height: auto !important; align-items: flex-start !important; - flex: 1 0 44% !important; :deep(.el-form-item__content) { - width: 100% !important; + width: 90% !important; } } .el_tool { diff --git a/src/views/basicdata/brand/basicZonePriceFrom.vue b/src/views/basicdata/brand/basicZonePriceFrom.vue index f925f98b..b1b46b72 100644 --- a/src/views/basicdata/brand/basicZonePriceFrom.vue +++ b/src/views/basicdata/brand/basicZonePriceFrom.vue @@ -1,140 +1,188 @@ - diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue index 15515a5f..7a4c67d7 100644 --- a/src/views/distribution/signfor/distributionSignfor.vue +++ b/src/views/distribution/signfor/distributionSignfor.vue @@ -727,19 +727,27 @@ export default { * 导出 * */ handleExportInfo() { + this.loading=true let row = {}; // if (!!this.ids) { // row.ids = this.ids; // } - const ids = this.selectionList.join(','); + const ids = this.selectionList.map(item=>item.id).join(','); + row.ids = ids; row.signingStatus = '2'; row = { ...row, ...this.query }; // console.log("<><><>>",ids); getSignforExportOwn(row).then(res => { + // console.log(res.data); + downloadXls(res.data, '签收数据.xlsx'); - }); + }).catch(()=>{ + + }).finally(()=>{ + this.loading=false + }) }, handlePictureInfo() { let row = {};