修改商家端页面

src/api/distribution/distributionReservation.js

@@ -12,6 +12,17 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getReservationList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/reservation/reservation_list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  })
+}
 
 export const getDetail = (id) => {
   return request({

src/option/basicdata/basicdataTripartiteMall.js

@@ -100,5 +100,11 @@ export default {
       label: "三方编码",
       prop: "tripartiteCoding",
     },
+    {
+      label: '品牌',
+      width: 120,
+      prop: 'brandName',
+    
+    },
   ]
 }

src/router/views/index.js

@@ -514,14 +514,14 @@ export default [
     ],
   },
   {
-    path: '/distribution/reservation/reservationAddFrom',
+    path: '/distribution/reservation/reservationAddFromByClient',
     component: Layout,
-    redirect: '/distribution/reservation/reservationAddFrom',
+    redirect: '/distribution/reservation/reservationAddFromByClient',
     children: [
       {
-        path: '/distribution/reservation/reservationAddFrom',
+        path: '/distribution/reservation/reservationAddFromByClient',
         name: 'name',
-        component: () => import('@/views/distribution/reservation/reservationAddFrom.vue'),
+        component: () => import('@/views/distribution/reservation/reservationAddFromByClient.vue'),
       },
     ],
   },
@@ -1080,6 +1080,22 @@ export default [
       },
     ],
   },
+// 下面的代码为 商场客户端的页面
+
+{
+  path: '/mail/order/add',
+  component: Layout,
+  redirect: '/mail/order/add',
+  children: [
+    {
+      path: '/mail/order/add',
+      name: '新建商场预约单',
+      component: () => import('@/views/mail/order/add.vue'),
+    },
+  ],
+},
+
+
   // {
   //   path: '/distribution/turndelivery/devtmp',
   //   component: Layout,

src/views/basicdata/brand/basicdataTripartiteMall.vue

@@ -88,6 +88,16 @@
           <el-form-item label="三方编码" prop="tripartiteCoding">
             <el-input v-model="form.tripartiteCoding" placeholder="请输入三方编码"/>
           </el-form-item>
+          <el-form-item label="品牌" prop="tripartiteCoding">
+            <el-select v-model="form.brandId" class="m-2" placeholder="请选择品牌" clearable>
+              <el-option
+                v-for="item in brandList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
@@ -103,6 +113,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataTripartiteMall";
+import { getList as getBrandList } from '@/api/basicdata/basicBrand';
 import option from "@/option/basicdata/basicdataTripartiteMall";
 import { mapGetters } from "vuex";
 
@@ -136,6 +147,7 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      brandList:[]
     }
   },
   mounted () {
@@ -168,8 +180,10 @@ export default {
       this.onLoad(this.page);
     },
     handleSubmit () {
+      const submitForm = this.form
+      submitForm.brandName = this.brandList.find(item => item.value == this.form.brandId).label
       if (!this.form.id) {
-        add(this.form).then(() => {
+        add(submitForm).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
@@ -178,7 +192,7 @@ export default {
           });
         });
       } else {
-        update(this.form).then(() => {
+        update(submitForm).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
@@ -278,6 +292,17 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
+      getBrandList().then((res)=>{
+      console.log('res ===>', res)
+      const {code, data: {records}} = res.data
+      if (code !== 200) return
+      this.brandList = records.map(val => {
+          return {
+            value: val.id,
+            label: val.brandName
+          }
+        })
+      })
     }
   }
 };

src/views/mail/order/list.vue

@@ -969,12 +969,11 @@ export default {
             && ele.customerTelephone !== item.customerTelephone
             && ele.customerAddress !== item.customerAddress ).length >= 1
       );
-      console.log("notEqualFlag=====",notEqualFlag);
       // 返回true,说明有不同
       // 返回false,说明全都相等
       if(!notEqualFlag){
         this.$router.push({
-          path: '/distribution/reservation/order_listFrom',
+          path: '/mail/order/add',
           query:{
             id: this.ids,
           }

src/views/mail/reservation/list.vue

@@ -44,30 +44,8 @@
                 <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
                   >添加预约
                 </el-button>
-                <el-button
+           
-                  v-if="this.queryA.reservationStatus === '1'"
+             
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleConfirmReservations"
-                  plain
-                  >批量确认
-                </el-button>
-                <el-button
-                  v-if="this.queryA.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleStockUp()"
-                  plain
-                  >批量转备货
-                </el-button>
-                <el-button
-                  v-if="this.queryA.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDeliverys"
-                  plain
-                  >批量转配送
-                </el-button>
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain
                   >导出
                 </el-button>
@@ -102,14 +80,7 @@
                     @click="viewReservation(slotProps.scope)"
                     >查看
                   </el-text>
-                  <el-text
+            
-                    size="small"
-                    type="primary"
-                    link
-                    icon="el-icon-view"
-                    @click="editsolt(slotProps.scope)"
-                    >编辑
-                  </el-text>
                   <el-text
                     size="small"
                     type="primary"
@@ -118,12 +89,7 @@
                     @click="cancelReservation(slotProps.scope)"
                     >取消预约
                   </el-text>
-                  <el-text
+              
-                    v-if="this.queryA.reservationStatus === '1' ? true : false"
-                    size="small"
-                    @click="confirmReservation(slotProps.scope)"
-                    >确认预约
-                  </el-text>
                 </template>
               </tablecmt>
             </template>
@@ -137,41 +103,7 @@
             <div class="avue-crud__header">
               <!-- 头部左侧按钮模块 -->
               <div class="avue-crud__left">
-                <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
+                
-                  >添加预约
-                </el-button>
-                <el-button
-                  v-if="this.queryB.reservationStatus === '1'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleConfirmReservations"
-                  plain
-                  >批量确认
-                </el-button>
-                <el-button
-                  v-if="this.queryB.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleStockUp()"
-                  plain
-                  >批量转备货
-                </el-button>
-                <el-button
-                  v-if="this.queryB.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDeliverys"
-                  plain
-                  >批量转配送
-                </el-button>
-                <el-button
-                  v-if="this.queryB.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="batchPrintData"
-                  plain
-                  >批量打印
-                </el-button>
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(2)" plain
                   >导出
                 </el-button>
@@ -337,7 +269,7 @@
 
 <script>
 import {
-  getList,
+  getReservationList,
   getDetail,
   add,
   update,
@@ -1281,26 +1213,10 @@ export default {
     },
     handleAdd() {
       this.$router.push({
-        path: '/distribution/reservation/reservationAddFrom',
+        path: '/mail/order/add',
-      });
-    },
-    handleEdit(row) {
-      console.log(row);
-      this.$router.push({
-        path: '/distribution/reservation/reservationAddFrom',
-        query: {
-          reservationId: row.id,
-        },
       });
     },
-    aaa() {
+
-      this.queryA.reservationStatus = '1';
-      this.onLoad(this.page);
-    },
-    bbb() {
-      this.queryB.reservationStatus = '2';
-      this.onLoad(this.page);
-    },
     handleView(row) {
       this.title = '查看';
       this.view = true;
@@ -1455,7 +1371,7 @@ export default {
         query.reservationStatus = this.queryA.reservationStatus || '1';
       }
       // if (this.queryA.reservationStatus)
-      getList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+      getReservationList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
         const data = res.data.data;
         console.log('>>>>>>>', data);
         if (data.records) {
@@ -1465,11 +1381,7 @@ export default {
                 item.orderSource = a.dictValue;
               }
             });
-            // this.stockupStatusData.forEach(b => {
+    
-            //   if (item.stockupStatus === b.dictKey) {
-            //     item.stockupStatus = b.dictValue;
-            //   }
-            // });
             this.resvervationStatusData.forEach(e => {
               if (item.reservationStatus === e.dictKey) {
                 item.reservationStatus = e.dictValue;
@@ -1487,7 +1399,6 @@ export default {
               }
             });
             this.periodOfTimeData.forEach(d => {
-              console.log('11111111111');
               if (item.periodOfTime === d.dictKey) {
                 item.periodOfTime = d.dictValue;
               }

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -260,6 +260,18 @@ export default {
           fixed: false,
           sortable: true,
         },
+
+        {
+          prop: 'orderPackageStatusName',
+          label: '包件状态',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
         {
           prop: 'orderPackageGroundingStatusName',
           label: '上架状态',
@@ -511,6 +523,22 @@ export default {
     },
     init() {
       this.height = this.setPx(document.body.clientHeight - 340);
+
+      getDictionaryBiz('order_package_code').then(res => {
+        this.distributionType = res.data.data;
+        this.$functions.checkcColumnList('orderPackageStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
+
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
     },
     searchHide() {
       this.search = !this.search;