Merge branch 'xinyan' into test

src/views/reportManage/TaskManage/components/shopInformation.vue

@@ -101,7 +101,18 @@ onMounted(() => {
   <el-card class="mx-8" shadow="hover">
     <vxe-grid ref="xGrid" :cell-style="cellStyle" :header-cell-style="headerCellStyle" stripe
               v-bind="gridOptions"
-              v-on="gridEvents"></vxe-grid>
+              v-on="gridEvents">
+      <template #status_default="{ row }">
+        <el-switch
+            v-model="row.status"
+            disabled
+            :active-value="1"
+            :inactive-value="0"
+            inline-prompt
+            size="small"
+        />
+      </template>
+    </vxe-grid>
   </el-card>
 
 </template>

src/views/reportManage/TaskManage/utils/columns.ts

@@ -270,4 +270,5 @@ export const shopInfoColumns = ref([
   },
   { field: 'vatNumber', title: 'VAT税号', align: 'center', minWidth: 95 },
   { field: 'vatCompany', title: 'VAT税号公司名称', align: 'center', minWidth: 135 },
+  { field: 'status', title: '状态', slots: { default: 'status_default' }, align: 'center', minWidth: 89 },
 ]);