变量确认

src/api/var.ts

@@ -155,6 +155,30 @@ export const apiOrderVarGetOrderNewVars = (orderItemId: any) => {
   });
 };
 
+/**
+ * 根据标量模板文件ID获取转换后变量
+ * @param  orderItemId
+ * @returns 
+ */
+export const confirmVar = (orderItemId: any) => {
+  return axios.get("/api/orderVar/confirm", {
+    params: { orderItemId }
+  });
+};
+
+/**
+ * 撤销确认的订单
+ * @param orderItemId 
+ * @returns 
+ */
+export const cancelVar = (orderItemId: any) => {
+  return axios.get("/api/orderVar/cancel", {
+    params: { orderItemId }
+  });
+};
+
+
+
 /**
  * 获取变量下拉数据
  * @param  orderItemId

src/views/var/varOrderFile/FileList.vue

@@ -29,15 +29,6 @@
           </template>
         </el-select>
       </el-form-item>
-<!-- 
-      <el-form-item label="创建人">
-        <el-input v-model="formState.createby_dict" placeholder="">
-          <template #append>
-            <el-button :icon="MoreFilled" @click="visibleUserModal = true"></el-button>
-          </template>
-        </el-input>
-      </el-form-item> -->
-
 
       <el-form-item>
         <el-button type="default" @click="onReset">重置</el-button>
@@ -87,7 +78,7 @@
             >
           </template>
         </vxe-column>
-        <vxe-column field="orderFileStatus_dictText" title="订单状态" width="120"></vxe-column>
+        <vxe-column field="orderFileStatus_dictText" title="文件状态" width="120"></vxe-column>
 
         <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
        

src/views/var/variables/Variables.vue

@@ -122,18 +122,21 @@
               >{{ item }}</el-link>
           </template>
         </vxe-column>
+
+        <vxe-column field="varStatus_dictText" title="变量状态" width="120"></vxe-column>
         <vxe-column title="解析" width="100">
           <template #default="{ row }">
-            <el-button v-if="!!row.varOrderFileId" type="text" size="small" @click="toRun(row)"
+            <el-button v-if="!!row.varOrderFileId&&row.varStatus != 'confirm'" type="text" size="small" @click="toRun(row)"
               >执行解析</el-button
             >
           </template>
         </vxe-column>
         <vxe-column title="操作" width="240">
           <template #default="{ row }">
-            <el-button type="text" size="small" @click="handleImportVar(row)">上传变量</el-button>
+            <el-button v-if="row.varStatus != 'confirm'"  type="text" size="small" @click="handleImportVar(row)">上传变量</el-button>
+            <el-button v-if="row.varStatus == 'converted'" type="text" size="small" @click="hanldeConfirmVar(row)">确认</el-button>
+            <el-button  v-if="row.varStatus == 'confirm'" type="text"   size="small" @click="hanldeCancel(row)">撤回</el-button>
             <el-button type="text" size="small" @click="handleShowVarRun(row)">查看解析</el-button>
-            <el-button type="text" size="small" @click="handleCheckOrder(row)">检查</el-button>
           </template>
         </vxe-column>
       </vxe-table>
@@ -204,11 +207,14 @@
 </template>
 
 <script lang="ts" setup>
+
 import { nextTick, onMounted, reactive, ref } from 'vue'
 import {
   apiOrderVarPage,
   apiOrderVarGetVars,
   apiOrderVarGetOrderNewVars,
+  confirmVar,
+  cancelVar,
   apiOrderVarSaveUpload,
   apiOrderVarRun,
   getCheckOrder
@@ -219,7 +225,7 @@ import ChooseOrderItem from './components/ChooseOrderItem.vue'
 
 import { filterVarData } from '@/utils/excel'
 import { uploadFile } from '@/api/excel'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage ,ElMessageBox} from 'element-plus'
 import { exportExcel } from '@/utils/export-excel'
 import type { BookType } from 'xlsx'
 import CheckOrder from './components/CheckOrder.vue'
@@ -261,10 +267,10 @@ const handleShowVarRun = async (row: any) => {
   currentRow.value = row
   const { data } = await apiOrderVarGetOrderNewVars(row.orderItemId)
   if (data?.code === 500) {
+    loading.value = false
     return ElMessage.error(data.message || '操作失败！')
   }
   const { res, titles } = filterVarData(data.result.varOrders || [])
-  console.log(titles)
   detailVariable.value.titles = titles as any
   detailVariable.value.data = res as any
   detailVariable.value.errors = data.result?.errors || []
@@ -275,6 +281,43 @@ const handleShowVarRun = async (row: any) => {
   })
 }
 
+const hanldeConfirmVar = async (row: any) => {
+ await ElMessageBox.confirm('是否确认转换后的变量？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+
+    const { data } = await confirmVar(row.orderItemId)
+    if (data.code == 200) {
+      ElMessage.success(data.message || '操作成功！')
+    } else {
+      ElMessage.error(data.message || '操作失败！')
+    }
+  onQuery()
+}
+
+const hanldeCancel = async (row: any) => {
+ await ElMessageBox.confirm('是否撤回已确认的变量？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+
+    const { data } = await cancelVar(row.orderItemId)
+    if (data.code == 200) {
+      ElMessage.success(data.message || '操作成功！')
+    } else {
+      ElMessage.error(data.message || '操作失败！')
+    }
+  onQuery()
+}
+
+
+
+
+
+
 const importVisible = ref(false)
 const importForm = ref({
   customerName: '',