冲突

src/views/order/batch-order/detail.vue

@@ -10,6 +10,9 @@
         <span v-if="p.key === 'avatar'">
           <ImagePreview :imageList="[p.value]" style="width: 120px" />
         </span>
+        <template v-else-if="p.key === 'logisticsMode'">
+          {{ logisticsLabelEnum[p.value] }}
+        </template>
         <template v-else>
           {{ p.value }}
         </template>
@@ -83,6 +86,7 @@
   import { toNumber } from 'lodash';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { useUserStore } from '/@/store/modules/user';
+  import { logisticsLabelEnum } from '/@/views/order/enum';
 
   const route = useRoute();
   const router = useRouter();

src/views/order/batch-order/index.vue

@@ -24,13 +24,16 @@
           </template>
         </a-alert>
       </template>
-      <template #toolbar>
+      <!-- <template #toolbar>
         <a-button v-auth="'AUTH_BATCH_ORDER:ADD'" type="primary" @click="handleCreate"> 新增</a-button>
-      </template>
+      </template> -->
       <template #bodyCell="{ column, record, text }">
         <template v-if="[].includes(column.dataIndex)">
           <img :src="text" class="photo" alt="图片" v-if="!!text" />
         </template>
+        <template v-if="column.dataIndex === 'logisticsMode'">
+          {{ logisticsLabelEnum[record.logisticsMode] }}
+        </template>
         <template v-if="column.dataIndex === 'action'">
           <TableAction
             :actions="[
@@ -48,7 +51,7 @@
                   title: '是否确认通过',
                   confirm: handleVerify.bind(null, record, 'PASSED'),
                 },
-                ifShow: hasPermission('AUTH_BATCH_ORDER:CHECK') && record.status === 'PENDING_REVIEW' && isDistributor,
+                ifShow: hasPermission('AUTH_BATCH_ORDER:CHECK') && record.status === 'PENDING_REVIEW',
               },
               {
                 label: '拒绝',
@@ -57,7 +60,7 @@
                   title: '是否确认拒绝',
                   confirm: handleVerify.bind(null, record, 'REJECT'),
                 },
-                ifShow: hasPermission('AUTH_BATCH_ORDER:CHECK') && record.status === 'PENDING_REVIEW' && isDistributor,
+                ifShow: hasPermission('AUTH_BATCH_ORDER:CHECK') && record.status === 'PENDING_REVIEW',
               },
               {
                 tooltip: '详情',
@@ -86,13 +89,14 @@
   import BatchOrderDrawer from './drawer.vue';
   import { columns, searchFormSchema } from './schema';
   import { useUserStore } from '/@/store/modules/user';
+  import { logisticsLabelEnum } from '/@/views/order/enum';
 
   const { hasPermission } = usePermission();
   const go = useGo();
   const userStore = useUserStore();
   const { formConfig, showTableSetting, bordered, showIndexColumn } = componentSetting.table;
 
-  const isDistributor = userStore.getIsDistributor;
+  // const isDistributor = userStore.getIsDistributor;
 
   const checkedKeys = ref<Array<string | number>>([]);
   const onSelectChange = (selectedRowKeys: (string | number)[]) => {

src/views/order/batch-work-order/detail.vue

@@ -13,6 +13,9 @@
         <span v-if="p.key === 'avatar'">
           <ImagePreview :imageList="[p.value]" style="width: 120px" />
         </span>
+        <template v-else-if="p.key === 'logisticsMode'">
+          {{ logisticsLabelEnum[p.value] }}
+        </template>
         <template v-else>
           {{ p.value }}
         </template>
@@ -60,6 +63,7 @@
   import { detailColumns } from '/@/views/order/batch-work-order/schema';
   import { BatchOrderDetail } from '/@/api/model/batchOrderDetail';
   import { BatchWorkOrder } from '/@/api/model/batchWorkOrder';
+  import { logisticsLabelEnum } from '/@/views/order/enum';
 
   const route = useRoute();
   const id = ref(route.params?.id);

src/views/order/batch-work-order/index.vue

@@ -27,7 +27,9 @@
     <div class="tableWrap">
       <div class="titleWrap">
         <span class="title">发货单列表</span>
-        <a-button type="primary" @click="handleAdd">新增</a-button>
+        <a-button type="primary" v-if="hasPermission('AUTH_ORDER_BATCH_WORK_ORDER:ADD')" @click="handleAdd"
+          >新增</a-button
+        >
       </div>
       <a-table
         :dataSource="dataSource"
@@ -47,18 +49,21 @@
           <template v-if="column.key === 'saleUserName'">
             {{ record.batchOrder.saleUserName }}
           </template>
+          <template v-if="column.dataIndex === 'logisticsMode'">
+            {{ logisticsLabelEnum[record.logisticsMode] }}
+          </template>
           <template v-if="column.key === 'action'">
             <a-button type="link" @click="handleView(record)">查看</a-button>
-            <!-- <a-button type="link" @click="handleEdit(record.id)">编辑</a-button>
+            <!-- <a-button type="link" @click="handleEdit(record.id)">编辑</a-button> -->
             <a-popconfirm
-              title="是否确认删除?"
+              title="是否确认收货?"
               ok-text="是"
               cancel-text="否"
-              @confirm="handleDelete(record.id)"
-              v-if="hasPermission('AUTH_PRODUCT_GOODS_CATEGORY:DELETE')"
+              @confirm="handleReceipt(record.id)"
+              v-if="hasPermission('AUTH_ORDER_BATCH_WORK_ORDER:RECEIPT') && record.status == 'DELIVERED'"
             >
-              <a-button type="link">删除</a-button>
-            </a-popconfirm> -->
+              <a-button type="link">确认收货</a-button>
+            </a-popconfirm>
           </template>
         </template>
       </a-table>
@@ -75,15 +80,23 @@
   import Modal from './modal.vue';
   import { message } from 'ant-design-vue';
   import { StatusEnum } from '/@/views/order/batch-order/schema';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
   import { useGo } from '/@/hooks/web/usePage';
+  import { logisticsLabelEnum } from '/@/views/order/enum';
+
+  interface FormStateType {
+    createTimeFrom: undefined | Date;
+    createTimeTo: undefined | Date;
+  }
+
   const go = useGo();
+  const { hasPermission } = usePermission();
 
   const formRef = ref();
   const modalRef = ref();
   const tableLoading = ref(false);
 
-  const formState = reactive({
+  const formState = reactive<FormStateType>({
     createTimeFrom: undefined,
     createTimeTo: undefined,
   });
@@ -119,10 +132,18 @@
     go('/main/batch-work-order/detail/' + record.id + `?order=${record.batchOrderId}`);
   };
 
-  const onChangeTime = (data) => {
+  const onChangeTime = (data: Date[] | undefined) => {
     formState.createTimeFrom = data && data[0];
     formState.createTimeTo = data && data[1];
   };
+
+  const handleReceipt = (id: number) => {
+    BatchWorkOrderApi.update({ id, status: 'CONFIRM' }).then((res) => {
+      message.success('确认成功');
+      getData();
+    });
+  };
+
   // const handleEdit = (id) => {
   //   editId.value = id;
   //   handleAdd();

src/views/order/batch-work-order/modal.vue

 <template>
   <a-modal
     v-model:visible="visible"
-    :title="props.editId ? '编辑' : '新增'"
+    title="新增"
     @ok="handleOk"
     @cancel="handleCancel"
     class="myModal"
@@ -86,8 +86,7 @@
   import { Distributor } from '/@/api/model/distributor';
   import { BatchOrderDetail } from '/@/api/model/batchOrderDetail';
 
-  const props = defineProps(['editId']);
-  const emits = defineEmits(['handleSuccess', 'update:editId']);
+  const emits = defineEmits(['handleSuccess']);
   const visible = ref<boolean>(false);
 
   const okLoading = ref(false);
@@ -119,6 +118,7 @@
       BatchWorkOrderApi.addInvoice(orderClone)
         .then(() => {
           message.success('新建成功');
+          emits('handleSuccess');
           handleCancel();
         })
         .finally(() => {

src/views/order/batch-work-order/schema.ts

@@ -74,7 +74,7 @@ export const columns = [
     title: '操作',
     key: 'action',
     fixed: 'right',
-    width: 100,
+    width: 180,
     align: 'center',
   },
 ];