123

src/views/order/orderChange/OrderChange.vue

@@ -99,17 +99,17 @@
         <vxe-column field="status_dictText" title="订单状态" width="120"></vxe-column>
         <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
         <vxe-column field="createBy_dictText" title="创建人" width="180"></vxe-column>
-        <vxe-column field="action" title="操作" width="280">
+        <vxe-column field="action" title="操作" min-width="280">
           <template #default="{ row }">
             <el-link style="font-size: 12px" type="primary" @click="toDetail(row)">查看</el-link>
             <el-divider direction="vertical"
-            v-if="row.status == 'un_convert' || row.status == 'un_confirm'"
+            v-if="row.status == 'un_convert'|| row.status == 'converted' || row.status == 'un_confirm'"
             ></el-divider>
             <el-link
               class="ml-1"
               style="font-size: 12px"
               type="primary"
-              v-if="row.status == 'un_convert'|| row.status == 'un_confirm'"
+              v-if="row.status == 'un_convert'|| row.status == 'converted'||row.status == 'un_confirm'"
               @click="confirmChange(row)"
               >转换</el-link
             >

src/views/var/varChange/VarChange.vue

@@ -47,7 +47,6 @@
         :loading="loading"
         :data="tableData"
       >
-        <vxe-column type="checkbox" width="50"></vxe-column>
         <vxe-column field="templateFileId" title="模版文件ID" width="200">
           <template #default="{ row }">
             <el-link
@@ -61,7 +60,7 @@
         <vxe-column field="productCode" title="产品编码" width="300"></vxe-column>
         <vxe-column field="status_dictText" title="订单状态" width="120"></vxe-column>
         <vxe-column field="createTime" title="创建时间" width="160"></vxe-column>
-        <vxe-column field="action" title="操作" >
+        <vxe-column field="action" title="操作" min-width="200">
           <template #default="{ row }">
             <el-link style="font-size: 12px" type="primary" @click="toDetail(row)">查看</el-link>
             <el-divider direction="vertical"></el-divider>