Merge remote-tracking branch 'origin/dev' into dev

src/option/basic/basicPrintTemplate.js

@@ -252,6 +252,16 @@ export default {
     //   prop: "reserve5",
     //   type: "input",
     // },
+    ,
+    {
+      label: "开关",
+      labelWidth: '100',
+      prop: "status",
+      type: "input",
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+    },
   ]
 }
 

src/views/basic/printTemplate/basicPrintTemplate.vue

@@ -38,6 +38,13 @@
                 </el-button>
 
             </template>
+
+            <template #status="scope">
+          <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="switChange(scope.row)"></el-switch>
+        </template>
+
+
+
             <!--      <template #menu="{size,row,index}">-->
             <!--        <el-button  type="primary" text @click="dowloadTemplate(row)">下载模板</el-button>-->
             <!--        <el-button  type="primary" text @click="viewTemplate(row)">查看模板</el-button>-->