bug 修改

Dockerfile

@@ -26,6 +26,6 @@ RUN echo "server {  \
     &&  mkdir  -p  /var/www \
     &&  mkdir -p /var/www/html
 
-ADD dist/ /var/www/html/
+ADD / /var/www/html/
 EXPOSE 80
 EXPOSE 443

src/api/order.ts

@@ -115,3 +115,11 @@ export const convertOrderBatchDeleteById = (ids: any) => {
     headers: formHeader
   })
 }
+
+/** 订单重发 */
+export const convertOrderReSend = (id: any) => {
+  return axios.get('/api/convertOrder/reSend', {
+    params: { id },
+    headers: formHeader
+  })
+}

src/api/product.ts

@@ -95,6 +95,14 @@ export const getExcelProdFileConfPage = (params: any) => {
 export const saveExcelProdFileConf = (data: any) => {
   return axios.post('/api/excelProductFileConf/add', data)
 }
+/**
+ * 修改产品对照
+ * @param data 
+ * @returns 
+ */
+export const editExcelProdFileConf = (data: any) => {
+  return axios.post('/api/excelProductFileConf/edit', data)
+}
 
 export const deleteExcelProdFileConfByIds = (ids: string) => {
   return axios.get('/api/excelProductFileConf/batchDeleteByIds', {

src/views/order/convertOrder/index.vue

@@ -38,10 +38,16 @@
           }}</el-link>
         </template>
       </vxe-column>
+      <vxe-column field="status" title="是否下发" width="120">
+        <template #default="{ row }">
+          {{ row.status == 'Y' ? '是' : '否' }}
+        </template>
+      </vxe-column>
       <vxe-column field="createTime" title="创建时间" width="200"></vxe-column>
-      <vxe-column field="action" title="操作" width="100">
+      <vxe-column field="action" title="操作" width="130" :show-overflow="false">
         <template #default="{ row }">
           <el-button type="primary" text size="small" @click="toDetail(row)">查看</el-button>
+          <el-button v-if="row.status == 'N'" type="primary" text size="small" @click="resetSend(row)">重发</el-button>
         </template>
       </vxe-column>
     </vxe-table>
@@ -85,7 +91,7 @@
 
 <script lang="ts" setup>
 import { ref, onMounted, reactive, watch } from 'vue'
-import { convertOrderBatchDeleteById, convertOrderPage } from '@/api/order'
+import { convertOrderBatchDeleteById, convertOrderPage, convertOrderReSend } from '@/api/order'
 import type { VxeTableInstance } from 'vxe-table'
 import CustomerModal from '@/components/CustomerModal/CustomerModal.vue'
 
@@ -140,6 +146,15 @@ const toDetail = (row: any) => {
   visible.value = true
 }
 
+const resetSend = async (row: any) => {
+  const {data} = await convertOrderReSend(row.convertOrderId)
+  if (data.code == 200) {
+    ElMessage.success(data.message || '操作成功')
+    queryConvert()
+  } else {
+    ElMessage.error(data.message || '操作失败')
+  }
+}
 const queryConvert = async () => {
   loading.value = true
   try {

src/views/product/productCompare/ProductCompare.vue

@@ -29,7 +29,7 @@
     <div class="">
       <vxe-toolbar>
         <template #buttons>
-          <el-button type="primary" @click="showEdit = true">新增</el-button>
+          <el-button type="primary" @click="openFormModal">新增</el-button>
           <el-button type="danger" @click="deleteRows">删除</el-button>
         </template>
       </vxe-toolbar>
@@ -152,7 +152,8 @@ import { computed, onMounted, reactive, ref, unref, watch } from 'vue'
 import {
   deleteExcelProdFileConfByIds,
   getExcelProdFileConfPage,
-  saveExcelProdFileConf
+  saveExcelProdFileConf,
+  editExcelProdFileConf
 } from '@/api/product'
 import { ElMessage } from 'element-plus'
 import type { VxeTableInstance } from 'vxe-table'
@@ -165,6 +166,7 @@ const prodVisible = ref(false)
 const loading = ref(false)
 const saveLoading = ref(false)
 const showEdit = ref(false)
+const optType = ref('add')
 const formState = reactive({
   productId_dictText: '',
   productId: '',
@@ -210,6 +212,7 @@ const deleteRows = async () => {
   }
 }
 const toEdit = (row: any) => {
+  optType.value = 'edit'
   Object.assign(formEdit, row)
   showEdit.value = true
 }
@@ -223,6 +226,11 @@ const openModal = (modal, type) => {
   modaltype.value = type
 }
 
+const openFormModal = () => {
+  optType.value = 'add'
+  showEdit.value = true
+}
+
 const tableData = ref([])
 const onHide = () => {
   // 重置表单
@@ -232,7 +240,10 @@ const onHide = () => {
     customerId_dictText: '',
     productId_dictText: '',
     productId: '',
-    excelFiled: ''
+    excelFiled: '',
+    customerUnit: '',
+    unit: '',
+    unitRatio: ''
   })
 }
 
@@ -252,7 +263,9 @@ const onSubmit = async () => {
   saveLoading.value = true
 
   try {
-    await saveExcelProdFileConf(formEdit)
+    optType.value == 'add'
+      ? await saveExcelProdFileConf(formEdit)
+      : await editExcelProdFileConf(formEdit)
     ElMessage.success('操作成功！')
     showEdit.value = false
     onQuery()