物流商报价

src/views/amz/inquiryRequest/index.vue

@@ -17,7 +17,13 @@
               <el-input v-model="queryParams.transportChannel" placeholder="请输入运输方式" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="报价截止时间" prop="deadline">
-              <el-date-picker clearable v-model="queryParams.deadline" type="date" value-format="YYYY-MM-DD" placeholder="请选择报价截止时间" />
+              <el-date-picker
+                clearable
+                v-model="queryParams.deadline"
+                type="date"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择报价截止时间"
+              />
             </el-form-item>
             <el-form-item label="渠道ID" prop="channelId">
               <el-input v-model="queryParams.channelId" placeholder="请输入渠道ID" clearable @keyup.enter="handleQuery" />
@@ -85,7 +91,7 @@
         <el-table-column label="询价状态" align="center" prop="inquiryStatus" />
         <el-table-column label="报价截止时间" align="center" prop="deadline" width="180">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.deadline, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.deadline, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="渠道ID" align="center" prop="channelId" />
@@ -103,10 +109,20 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['amz:inquiryRequest:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasRoles="['superadmin']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="提交报价" placement="top">
+              <el-button link type="primary" icon="CircleCheck" @click="handleSubmit(scope.row)" v-hasRoles="['wuliu']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['amz:inquiryRequest:remove']"></el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasRoles="['yunying']"
+                v-hasPermi="['amz:inquiryRequest:remove']"
+              ></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -170,12 +186,62 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 添加或修改物流报价对话框 -->
+    <el-dialog :title="quoteDialog.title" v-model="quoteDialog.visible" width="800px" append-to-body>
+      <el-form ref="logisticsQuoteFormRef" :model="quoteForm" :rules="rules" label-width="180px">
+        <el-form-item label="目的地" prop="destination">
+          <el-input v-model="quoteForm.destination" placeholder="请输入目的地" disabled />
+        </el-form-item>
+        <el-form-item label="渠道名称" prop="transportChannel">
+          <el-input v-model="quoteForm.transportChannel" placeholder="请输入渠道名称" disabled />
+        </el-form-item>
+        <el-form-item label="基础价格" prop="price">
+          <el-input v-model="quoteForm.price" placeholder="请输入基础价格" />
+        </el-form-item>
+        <el-form-item label="时效" prop="leadTime">
+          <el-input-number v-model="quoteForm.leadTime" :min="1" :max="100">
+            <template #suffix>
+              <span>天</span>
+            </template>
+          </el-input-number>
+        </el-form-item>
+        <el-form-item label="附加费" prop="surcharge">
+          <el-input v-model="quoteForm.surcharge" placeholder="请输入附加费" />
+        </el-form-item>
+        <el-form-item label="报价生效起止日期" prop="quoteDate">
+          <el-date-picker
+            v-model="quoteForm.quoteDate"
+            type="daterange"
+            range-separator="到"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="choeseDate"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="报价备注" prop="remark">
+          <el-input v-model="quoteForm.remark" placeholder="请输入报价备注" />
+        </el-form-item>
+        <el-form-item label="渠道ID" prop="channelId">
+          <el-input v-model="quoteForm.channelId" placeholder="请输入渠道ID" disabled />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitQuoteForm">提 交</el-button>
+          <el-button :loading="buttonLoading" type="primary" @click="saveQuoteForm">暂 存</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="InquiryRequest" lang="ts">
 import { listInquiryRequest, getInquiryRequest, delInquiryRequest, addInquiryRequest, updateInquiryRequest } from '@/api/amz/inquiryRequest';
 import { InquiryRequestVO, InquiryRequestQuery, InquiryRequestForm } from '@/api/amz/inquiryRequest/types';
+import { LogisticsQuoteForm } from '@/api/amz/logisticsQuote/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -196,6 +262,11 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const quoteDialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
 const initFormData: InquiryRequestForm = {
   id: undefined,
   inquiryNo: undefined,
@@ -210,8 +281,24 @@ const initFormData: InquiryRequestForm = {
   effectiveStartTime: undefined,
   effectiveEndTime: undefined
 };
+const initQuoteForm: LogisticsQuoteForm = {
+  userId: undefined,
+  destination: undefined,
+  transportChannel: undefined,
+  price: undefined,
+  leadTime: undefined,
+  surcharge: undefined,
+  quoteStartDate: undefined,
+  quoteEndDate: undefined,
+  quoteDate: [] as Date[],
+  isSubmitted: undefined,
+  remark: undefined,
+  channelType: undefined,
+  channelId: undefined
+};
 const data = reactive<PageData<InquiryRequestForm, InquiryRequestQuery>>({
   form: { ...initFormData },
+  quoteForm: { ...initQuoteForm },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -242,7 +329,7 @@ const data = reactive<PageData<InquiryRequestForm, InquiryRequestQuery>>({
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules, quoteForm } = toRefs(data);
 
 /** 查询物流询价列表 */
 const getList = async () => {
@@ -259,6 +346,12 @@ const cancel = () => {
   dialog.visible = false;
 };
 
+const choeseDate = () => {
+  quoteForm.value.quoteStartDate = quoteForm.value.quoteDate[0];
+  quoteForm.value.quoteEndDate = quoteForm.value.quoteDate[1];
+  console.log(quoteForm.value.quoteDate[0]);
+};
+
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
@@ -317,6 +410,25 @@ const submitForm = () => {
     }
   });
 };
+const submitQuoteForm = () => {
+  quoteForm.value.isSubmitted = false;
+  quoteForm.value.quoteDate = [quoteForm.value.quoteStartDate, quoteForm.value.quoteEndDate];
+  quoteForm.value.quoteStartDate = undefined;
+  quoteForm.value.quoteEndDate = undefined;
+  quoteForm.value.remark = undefined;
+  quoteForm.value.channelType = undefined;
+  quoteForm.value.channelId = undefined;
+};
+
+const saveQuoteForm = () => {
+  quoteForm.value.isSubmitted = false;
+  quoteForm.value.quoteDate = [quoteForm.value.quoteStartDate, quoteForm.value.quoteEndDate];
+  quoteForm.value.quoteStartDate = undefined;
+  quoteForm.value.quoteEndDate = undefined;
+  quoteForm.value.remark = undefined;
+  quoteForm.value.channelType = undefined;
+  quoteForm.value.channelId = undefined;
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: InquiryRequestVO) => {
@@ -327,6 +439,25 @@ const handleDelete = async (row?: InquiryRequestVO) => {
   await getList();
 };
 
+const handleSubmit = async (row?: InquiryRequestVO) => {
+  console.log('handleSubmit');
+  console.log(row.channelId);
+  data.quoteForm.destination = row.destination;
+  data.quoteForm.transportChannel = row.transportChannel;
+  data.quoteForm.channelId = row.channelId;
+  data.quoteForm.channelName = row.channelName;
+  quoteDialog.visible = true;
+  console.log(row.effectiveStartTime);
+  // data.quoteForm.quoteDate[0] = row.effectiveStartTime;
+  // data.quoteForm.quoteDate[1] = row.effectiveEndTime;
+  const dateString = row.effectiveStartTime.replace(' ', 'T');
+  const dateString2 = row.effectiveEndTime.replace(' ', 'T');
+  const date = new Date(dateString); // 生成 Date 对象
+  const date2 = new Date(dateString2); // 生成 Date 对象
+  data.quoteForm.quoteDate[0] = date;
+  data.quoteForm.quoteDate[1] = date2;
+};
+
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download(

src/views/amz/logisticsQuote/index.vue

@@ -23,12 +23,7 @@
               <el-input v-model="queryParams.surcharge" placeholder="请输入附加费" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="报价生效日期" prop="quoteDate">
-              <el-date-picker clearable
+              <el-date-picker clearable v-model="queryParams.quoteDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择报价生效日期" />
-                v-model="queryParams.quoteDate"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择报价生效日期"
-              />
             </el-form-item>
             <el-form-item label="渠道ID" prop="channelId">
               <el-input v-model="queryParams.channelId" placeholder="请输入渠道ID" clearable @keyup.enter="handleQuery" />
@@ -46,16 +41,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['amz:logisticsQuote:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['amz:logisticsQuote:add']"> 新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['amz:logisticsQuote:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['amz:logisticsQuote:edit']"
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['amz:logisticsQuote:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['amz:logisticsQuote:remove']"
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['amz:logisticsQuote:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['amz:logisticsQuote:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -93,52 +92,7 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改物流报价对话框 -->
+
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="logisticsQuoteFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="主键ID" prop="id">
-          <el-input v-model="form.id" placeholder="请输入主键ID" />
-        </el-form-item>
-        <el-form-item label="物流商用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入物流商用户ID" />
-        </el-form-item>
-        <el-form-item label="目的地" prop="destination">
-          <el-input v-model="form.destination" placeholder="请输入目的地" />
-        </el-form-item>
-        <el-form-item label="渠道名称" prop="transportChannel">
-          <el-input v-model="form.transportChannel" placeholder="请输入渠道名称" />
-        </el-form-item>
-        <el-form-item label="基础价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入基础价格" />
-        </el-form-item>
-        <el-form-item label="时效" prop="leadTime">
-          <el-input v-model="form.leadTime" placeholder="请输入时效" />
-        </el-form-item>
-        <el-form-item label="附加费" prop="surcharge">
-          <el-input v-model="form.surcharge" placeholder="请输入附加费" />
-        </el-form-item>
-        <el-form-item label="报价生效日期" prop="quoteDate">
-          <el-date-picker clearable
-            v-model="form.quoteDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择报价生效日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="报价备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入报价备注" />
-        </el-form-item>
-        <el-form-item label="渠道ID" prop="channelId">
-          <el-input v-model="form.channelId" placeholder="请输入渠道ID" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -177,10 +131,10 @@ const initFormData: LogisticsQuoteForm = {
   isSubmitted: undefined,
   remark: undefined,
   channelType: undefined,
-  channelId: undefined,
+  channelId: undefined
-}
+};
 const data = reactive<PageData<LogisticsQuoteForm, LogisticsQuoteQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -194,46 +148,21 @@ const data = reactive<PageData<LogisticsQuoteForm, LogisticsQuoteQuery>>({
     isSubmitted: undefined,
     channelType: undefined,
     channelId: undefined,
-    params: {
+    params: {}
-    }
   },
   rules: {
-    id: [
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
-      { required: true, message: "主键ID不能为空", trigger: "blur" }
+    userId: [{ required: true, message: '物流商用户ID不能为空', trigger: 'blur' }],
-    ],
+    destination: [{ required: true, message: '目的地不能为空', trigger: 'blur' }],
-    userId: [
+    transportChannel: [{ required: true, message: '渠道名称不能为空', trigger: 'blur' }],
-      { required: true, message: "物流商用户ID不能为空", trigger: "blur" }
+    price: [{ required: true, message: '基础价格不能为空', trigger: 'blur' }],
-    ],
+    leadTime: [{ required: true, message: '时效不能为空', trigger: 'blur' }],
-    destination: [
+    surcharge: [{ required: true, message: '附加费不能为空', trigger: 'blur' }],
-      { required: true, message: "目的地不能为空", trigger: "blur" }
+    quoteDate: [{ required: true, message: '报价生效日期不能为空', trigger: 'blur' }],
-    ],
+    isSubmitted: [{ required: true, message: '提交状态不能为空', trigger: 'blur' }],
-    transportChannel: [
+    remark: [{ required: true, message: '报价备注不能为空', trigger: 'blur' }],
-      { required: true, message: "渠道名称不能为空", trigger: "blur" }
+    channelType: [{ required: true, message: '渠道类型不能为空', trigger: 'change' }],
-    ],
+    channelId: [{ required: true, message: '渠道ID不能为空', trigger: 'blur' }]
-    price: [
-      { required: true, message: "基础价格不能为空", trigger: "blur" }
-    ],
-    leadTime: [
-      { required: true, message: "时效不能为空", trigger: "blur" }
-    ],
-    surcharge: [
-      { required: true, message: "附加费不能为空", trigger: "blur" }
-    ],
-    quoteDate: [
-      { required: true, message: "报价生效日期不能为空", trigger: "blur" }
-    ],
-    isSubmitted: [
-      { required: true, message: "提交状态不能为空", trigger: "blur" }
-    ],
-    remark: [
-      { required: true, message: "报价备注不能为空", trigger: "blur" }
-    ],
-    channelType: [
-      { required: true, message: "渠道类型不能为空", trigger: "change" }
-    ],
-    channelId: [
-      { required: true, message: "渠道ID不能为空", trigger: "blur" }
-    ],
   }
 });
 
@@ -246,55 +175,55 @@ const getList = async () => {
   logisticsQuoteList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   logisticsQuoteFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: LogisticsQuoteVO[]) => {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加物流报价";
+  dialog.title = '添加物流报价';
-}
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: LogisticsQuoteVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getLogisticsQuote(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改物流报价";
+  dialog.title = '修改物流报价';
-}
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -302,32 +231,36 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateLogisticsQuote(form.value).finally(() =>  buttonLoading.value = false);
+        await updateLogisticsQuote(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addLogisticsQuote(form.value).finally(() =>  buttonLoading.value = false);
+        await addLogisticsQuote(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: LogisticsQuoteVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除物流报价编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除物流报价编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delLogisticsQuote(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('amz/logisticsQuote/export', {
+  proxy?.download(
-    ...queryParams.value
+    'amz/logisticsQuote/export',
-  }, `logisticsQuote_${new Date().getTime()}.xlsx`)
+    {
-}
+      ...queryParams.value
+    },
+    `logisticsQuote_${new Date().getTime()}.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();