详情页

src/components/jdStatus/index.vue

@@ -41,13 +41,6 @@ window.addEventListener('message', function(event) {
   }
 });
 
-watch(() => modelValue, (newValue, oldValue) => {
-  if(newValue){
-    alert(111)
-  } else {
-    alert(222)
-  }
-});
 
 onMounted(() => {
   console.log('222', modelValue)

src/views/WDLY/jd/backOrder/index.vue

@@ -14,13 +14,126 @@
                 @get-list="getList">
         </byTable>
 
-        <el-dialog z-index="1100" title="退货单详情" v-if="dialogVisible" v-model="dialogVisible" width="800px" v-loading="loading">
-            <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
-
-            </byForm>
+        <el-dialog z-index="1100" title="退货单详情" v-if="dialogVisible" v-model="formData.data" width="1500px" v-loading="loading">
+            <el-descriptions title="基础信息" />
+            <el-form label-width="auto" :rules="rules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="退货单号：" :span="8">
+                            {{formData.data.returnId}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="供应商名称：" :span="8">
+                            {{formData.data.providerName}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="创建日期：" :span="8">
+                            {{formData.data.createDate}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="退货地配送中心名称：" :span="8">
+                            {{formData.data.fromDeliverCenterName}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="目的地配送中心名称：" :span="8">
+                            {{formData.data.toDeliverCenterName}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="退货单状态名称：" :span="8">
+                            {{formData.data.returnStateName}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="退货总数量：" :span="8">
+                            {{formData.data.totalNum}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="退货总金额：" :span="8">
+                            {{formData.data.totalPrice}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="商品库房名称：" :span="8">
+                            {{formData.data.stockName}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="退货地仓库地址：" :span="8">
+                            {{formData.data.wareHouseAddress}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="仓储联系人电话：" :span="8">
+                            {{formData.data.wareHouseCell}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="仓储联系人：" :span="8">
+                            {{formData.data.wareHouseContact}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="退货单出库时间：" :span="8">
+                            {{formData.data.outStoreRoomDate}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="退货单品种数：" :span="8">
+                            {{formData.data.wareVariety}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="退货结算状态名称：" :span="8">
+                            {{formData.data.balanceStateName}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="退货单结算时间：" :span="8">
+                            {{formData.data.balanceDate}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-descriptions title="退货单明细" />
+                    <el-table :data="formData.data.jdBackDetailsList" stripe style="width: 100%">
+                        <!--            <el-table stripe style="width: 100%">-->
+                        <el-table-column prop="wareId" label="京东商品编号" width="180">
+                            <template #default="scope">
+                                <span :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{scope.row.wareId}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="wareName" label="京东商品名称">
+                            <template #default="scope">
+                                <span :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{scope.row.wareName}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="brandName" label="京东品牌名称"/>
+                        <el-table-column prop="productName" label="产品名称" />
+                        <el-table-column prop="returnsPrice" label="申请退货价格"/>
+                        <el-table-column prop="returnsNum" label="申请退货数量" />
+                        <el-table-column prop="factNum" label="实际退货数量" />
+                        <el-table-column prop="totalPrice" label="退货总金额" />
+                    </el-table>
+                </el-row>
+            </el-form>
             <template #footer>
                 <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-                <el-button type="primary" v-if="formData.data.businessStatus == 1" @click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
             </template>
         </el-dialog>
     </div>
@@ -65,9 +178,23 @@ const config = computed(() => {
         {
             attrs: {
                 label: "退货单号",
-                prop: "returnId",
                 align: "center"
-            }
+            },
+            renderHTML(row) {
+                return [
+                    {
+                        attrs: {
+                            label: row.returnId,
+                            type: "primary",
+                            text: true,
+                        },
+                        el: "button",
+                        click() {
+                            getDtl(row);
+                        },
+                    },
+                ];
+            },
         },
         {
             attrs: {
@@ -154,7 +281,7 @@ const config = computed(() => {
                             getDtl(row);
                         },
                     },
-                    row.businessStatus!=0?
+                    row.businessStatus!=1?
                         {
                             attrs: {
                                 label: "退货单确认",
@@ -191,29 +318,7 @@ const formOption = reactive({
     itemWidth: 100,
     rules: [],
 });
-const byform = ref(null);
 
-const formConfig = computed(() => {
-    return [
-        {
-            type: "input",
-            prop: "orderId",
-            label: "京东订单号",
-            readonly: true
-        },
-        {
-            type: "input",
-            prop: "createdDate",
-            label: "订购时间",
-            readonly: true
-        },
-        {
-            type: "input",
-            label: "采购单明细，应该是个一对多还没弄",
-            readonly: true
-        },
-    ];
-});
 
 const getDictlist = async () => {
     // proxy
@@ -283,27 +388,6 @@ const confirmBusinessStatus = (row) => {
     );
 }
 
-const submitForm = () => {
-    byform.value.handleSubmit(() => {
-        submitLoading.value = true;
-        //TODO 这里应该是订单回告
-        proxy.post("/jdOrder/" + modalType.value, formData.data).then(
-            () => {
-                ElMessage({
-                    message: modalType.value == "add" ? "添加成功" : "编辑成功",
-                    type: "success",
-                });
-                dialogVisible.value = false;
-                submitLoading.value = false;
-                getList();
-            },
-            (err) => {
-                console.log(err);
-                submitLoading.value = false;
-            }
-        );
-    });
-};
 
 
 getDictlist()

src/views/WDLY/jd/order/index.vue

@@ -14,7 +14,7 @@
                 @get-list="getList">
         </byTable>
 
-        <el-dialog :z-index="1500" :title="formData.data.businessStatus=='1'?'采购单回告':'采购单详情'" v-if="dialogVisible" v-model="dialogVisible" width="1500px" v-loading="loading">
+        <el-dialog :z-index="1500" :title="formData.data.businessStatus=='1'?'采购单回告':'采购单详情'" v-if="dialogVisible" v-model="formData.data" width="1500px" v-loading="loading">
             <el-descriptions title="基础信息" />
             <el-form label-width="auto" :rules="rules">
                 <el-row>
@@ -46,21 +46,150 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
+                        <el-form-item label="采购员姓名：" :span="8">
+                            {{formData.data.purchaserName}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="删除状态：" :span="8">
+                            {{formData.data.statusName}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="是否EPT定制：" :span="8">
+                            {{formData.data.isEptCustomized?'是':'否'}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
                         <el-form-item label="订单状态：" :span="8">
                             {{formData.data.stateName}}
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="完成时间：" :span="8">
+                            {{formData.data.completedDate}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="账期：" :span="8">
+                            {{formData.data.accountPeriod}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="收货负责人：" :span="8">
+                            {{formData.data.receiverName}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="收货电话：" :span="8">
+                            {{formData.data.warehousePhone}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="详细地址：" :span="8">
+                            {{formData.data.address}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="采购类型：" :span="8">
+                            {{formData.data.orderTypeName}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="订单属性：" :span="8">
+                            {{formData.data.orderAttributeName}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="回告状态：" :span="8">
+                            {{formData.data.confirmStateName}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="顾客单号：" :span="8">
+                            {{formData.data.customerOrderid}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="品种数量：" :span="8">
+                            {{formData.data.wareVariety}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="预计到货时间：" :span="8">
+                            {{formData.data.deliveryTime}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="是否可回告：" :span="8">
+                            {{formData.data.isCanConfirm?"可回告":"不可回告"}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="是否有差异：" :span="8">
+                            {{formData.data.isExistActualNumDif=='0'?"存在差异":"无差异"}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="是否已结算：" :span="8">
+                            {{formData.data.balanceStatus?"已结算":"未结算"}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="入库时间：" :span="8">
+                            {{formData.data.storageTime}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="TC转运标识：" :span="8">
+                            {{formData.data.tcFlagName}}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="预约时间：" :span="8">
+                            {{formData.data.bookTime}}
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
                     <el-descriptions title="采购单明细" />
                     <el-table :data="formData.data.jdOrderDetailsList" stripe style="width: 100%">
         <!--            <el-table stripe style="width: 100%">-->
-                        <el-table-column prop="wareId" label="商品编号" width="180" />
+                        <el-table-column prop="wareId" label="京东商品编号" width="180">
+                            <template #default="scope">
+                                <span :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{scope.row.wareId}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="wareName" label="京东商品名称">
+                            <template #default="scope">
+                                <span :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{scope.row.wareName}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="productName" label="产品名称" />
                         <el-table-column prop="deliverCenterName" label="配送中心名称" width="180" />
-                        <el-table-column prop="wareName" label="商品名称" />
                         <el-table-column prop="purchasePrice" label="采购价" />
                         <el-table-column prop="originalNum" label="原始采购数量" />
-                        <el-table-column v-if="formData.data.businessStatus!='0'" prop="confirmNum" label="确认数量" >
+                        <el-table-column prop="confirmNum" label="回告数量" />
+                        <el-table-column prop="actualNum" label="实收数量" />
+                        <el-table-column prop="nonDeliveryReason" label="不满足原因" />
+                        <el-table-column prop="totalPrice" label="采购总金额" />
+                        <el-table-column prop="storeName" label="库房名称" />
+                        <el-table-column prop="wareProperty" label="EPT采购单定制相关信息" />
+<!--                        <el-table-column v-if="formData.data.businessStatus!='0'" prop="confirmNum" label="确认数量" >
                             <template v-slot="scope">
                                 <el-form-item :rules="rules['confirmNum']">
                                     <el-input-number v-if="formData.data.businessStatus=='1'" :min="1" :step="1" :max="scope.row.originalNum" v-model="scope.row.confirmNum" placeholder="请输入确认数量"/>
@@ -90,7 +219,7 @@
                                 </el-form-item>
                                 <span v-if="formData.data.businessStatus=='2'">{{scope.row.deliverCenterName}}</span>
                             </template>
-                        </el-table-column>
+                        </el-table-column>-->
                     </el-table>
                 </el-row>
             </el-form>
@@ -145,9 +274,23 @@ const config = computed(() => {
         {
             attrs: {
                 label: "京东订单号",
-                prop: "orderId",
-                align: "center"
-            }
+                align: "center",
+            },
+            renderHTML(row) {
+                return [
+                    {
+                        attrs: {
+                            label: row.orderId,
+                            type: "primary",
+                            text: true,
+                        },
+                        el: "button",
+                        click() {
+                            getDtl(row);
+                        },
+                    },
+                ];
+            },
         },
         {
             attrs: {