Merge branch 'feature/mockApi' of http://192.168.0.115:3000/zhangyupeng/zfb_mp into feature/mockApi

src/api/order/list.ts

@@ -32,6 +32,16 @@ export const ShippingListApi = (params: PageParams) =>
     },
   });
 
+export const sendGoods = (params) =>
+  defHttp.post<ListGetResultModel>({
+    url: Api.sendGoods,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
 export const BrandListApi = (params: PageParams) =>
   defHttp.post<ListGetResultModel>({
     url: Api.brandList,
@@ -45,7 +55,6 @@ export const BrandListApi = (params: PageParams) =>
 export const GetOrderInfoApi = (params: OrderInfoParams) =>
   defHttp.get<ListGetResultModel>({
     url: `${Api.getOrderInfo}/${params.id}/${params.brandId}`,
-    joinTime: false,
     headers: {
       // @ts-ignore
       ignoreCancelToken: true,

src/views/dashboard/corporation/detailsModal.vue

@@ -3,12 +3,17 @@
     v-bind="$attrs"
     @register="register"
     title="新增设备"
-    @ok="submitMolad(true)"
     cancelText="拒绝"
     okText="通过"
-    @cancel="submitMolad(false)"
+    @cancel="closeModal"
     @visible-change="handleVisibleChange"
   >
+    <template #footer>
+      <div>
+        <a-button type="primary" danger @click="submitMolad(false)">拒绝</a-button>
+        <a-button type="primary" @click="submitMolad(true)">同意</a-button>
+      </div>
+    </template>
     <div class="pt-3px pr-3px">
       <BasicForm @register="registerForm">
         <template #text="{ model, field }">
@@ -134,6 +139,7 @@
         },
       });
       async function submitMolad(val) {
+        console.log('submitMolad', val);
         let res = await auditCompany({
           id: modelRef.value.id,
           state: val ? 1 : 2,
@@ -216,6 +222,7 @@
         modelRef,
         handleVisibleChange,
         num,
+        closeModal,
         errorMsg: error,
       };
     },

src/views/dashboard/corporation/index.vue

@@ -160,8 +160,8 @@
             label: 'id',
             component: 'Input',
             colProps: {
-              xl: 3,
-              xxl: 3,
+              xl: 5,
+              xxl: 5,
             },
           },
           {

src/views/dashboard/order/confirmModal.vue

@@ -7,13 +7,13 @@
   import { defineComponent, reactive } from 'vue';
   import { BasicForm, useForm, FormSchema } from '/@/components/Form/index';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { ShippingListApi, GetOrderInfoApi } from '/@/api/order/list';
+  import { ShippingListApi, sendGoods } from '/@/api/order/list'; //GetOrderInfoApi
 
   export default defineComponent({
     name: 'ConfirmModal',
     components: { BasicModal, BasicForm },
-    emits: ['success', 'register'],
-    setup() {
+    emits: ['success', 'register', 'reload'],
+    setup(_, { emit }) {
       // const isUpdate = ref(true);
       let modalRecord = reactive({
         id: 0,
@@ -30,12 +30,16 @@
             labelField: 'name',
             valueField: 'id',
             immediate: true,
+            onChange: function (value, opt) {
+              Reflect.set(modalRecord, 'shippingName', opt.label);
+              console.log('labelField', modalRecord, value, opt);
+            },
             params: {
               page: 1,
               limit: 1000,
             },
+            required: true,
           },
-          required: true,
         },
         {
           field: 'orderSn',
@@ -44,7 +48,7 @@
           required: true,
         },
       ];
-      const [registerForm, { validate }] = useForm({
+      const [registerForm, { validate, resetFields }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -56,19 +60,24 @@
       });
       function onDataReceive(data) {
         console.log('data', data);
-        modalRecord.id = data.id;
-        modalRecord.brandId = data.brandId;
+        modalRecord = { ...data };
+        // modalRecord.brandId = data.brandId;
       }
       async function handleSubmit() {
         console.log('handleSubmit');
         try {
           const values = await validate();
-          console.log('modalRecord', modalRecord);
-          console.log('values', values);
-          const orderInfo = await GetOrderInfoApi(modalRecord);
-          console.log('orderInfo', orderInfo);
-          // Reflect.set(modalRecord, 'shippingNo', values.shippingNo);
-          // Reflect.set(modalRecord, 'shippingId', values.shippingNo);
+          // const orderInfo = await GetOrderInfoApi(modalRecord);
+          // console.log('orderInfo', orderInfo);
+
+          Reflect.set(modalRecord, 'shippingNo', values.orderSn);
+          Reflect.set(modalRecord, 'shippingId', values.shippingId);
+          console.log('modalRecord', modalRecord, values);
+          const orderInfo = await sendGoods(modalRecord);
+          console.log('orderInfo', values, orderInfo);
+          resetFields();
+          closeModal();
+          emit('reload');
         } catch (error) {}
       }
 

src/views/dashboard/order/list.vue

@@ -98,7 +98,7 @@ userName: "微信用户q0zj95zuo4pv" -->
         />
       </template>
     </BasicTable>
-    <ConfirmModal @register="registerConfirmModal" />
+    <ConfirmModal @register="registerConfirmModal" @reload="reload" />
   </div>
 </template>
 <script lang="ts">
@@ -296,7 +296,7 @@ userName: "微信用户q0zj95zuo4pv" -->
 
       const [registerConfirmModal, { openModal: openConfirmModal }] = useModal();
 
-      const [registerTable, { getSelectRowKeys }] = useTable({
+      const [registerTable, { getSelectRowKeys, reload }] = useTable({
         title: '订单列表',
         api: ListApi,
         columns: columns,
@@ -372,7 +372,6 @@ userName: "微信用户q0zj95zuo4pv" -->
       function sendPackage(record: Recordable) {
         openConfirmModal(true, record);
       }
-
       function handleConfirmReceive() {
         const keys = getSelectRowKeys();
         if (keys.length === 0) {
@@ -394,6 +393,7 @@ userName: "微信用户q0zj95zuo4pv" -->
         // onSelectChange,
         handleConfirmReceive,
         registerConfirmModal,
+        reload,
       };
     },
   });

src/views/dashboard/product/ref.vue

@@ -1,13 +1,15 @@
 <template>
-  <BasicTable @register="registerTable">
-    <template #toolbar>
-      <a-button type="primary" @click="handleCreate"> 新增商品分类</a-button>
-    </template>
-    <template #action="{ record, column }">
-      <TableAction :actions="createActions(record, column)" />
-    </template>
-  </BasicTable>
-  <addModal @register="registerModal" @ok="handleSaveAdd" />
+  <div>
+    <BasicTable @register="registerTable">
+      <template #toolbar>
+        <a-button type="primary" @click="handleCreate"> 新增商品分类</a-button>
+      </template>
+      <template #action="{ record, column }">
+        <TableAction :actions="createActions(record, column)" />
+      </template>
+    </BasicTable>
+    <addModal @register="registerModal" @ok="handleSaveAdd" />
+  </div>
 </template>
 
 <script lang="ts">