类型

src/views/modules/siteAdmin/siteConfig/add.vue

 <template>
 <template>
-  <el-dialog :title="dialogConfig.title" :visible.sync="dialogVisible" width="60%" @close="dialogClose"
+  <el-dialog :title="dialogConfig.title" :visible.sync="dialogVisible" width="95%" @close="dialogClose"
              :close-on-click-modal="false">
              :close-on-click-modal="false">
     <el-form :model="formData" label-width="110px" ref="ruleForm" :rules="rules" :disabled="dialogConfig.disabled">
     <el-form :model="formData" label-width="110px" ref="ruleForm" :rules="rules" :disabled="dialogConfig.disabled">
       <el-form-item label="厂区：" prop="factoryId">
       <el-form-item label="厂区：" prop="factoryId">
@@ -44,7 +44,7 @@
         </template>
         </template>
         <vxe-table ref="xTable" :show-header="false" border="false" resizable :data="formData.entities" row-id="id"
         <vxe-table ref="xTable" :show-header="false" border="false" resizable :data="formData.entities" row-id="id"
                    :checkbox-config="{ highlight: true }">
                    :checkbox-config="{ highlight: true }">
-          <vxe-column width="80px">
+          <vxe-column width="50px">
             <template #default="{ row }">
             <template #default="{ row }">
               <div>点位</div>
               <div>点位</div>
             </template>
             </template>
@@ -119,7 +119,7 @@
               </el-form-item>
               </el-form-item>
             </template>
             </template>
           </vxe-column>
           </vxe-column>
-          <vxe-column>
+          <vxe-column width="100px">
             <template #default="{ row , $rowIndex }">
             <template #default="{ row , $rowIndex }">
               <el-form-item :prop="`entities[${$rowIndex}].keyNum`"
               <el-form-item :prop="`entities[${$rowIndex}].keyNum`"
                             :rules="[{ required: false, message: '请选择按钮序号', trigger: 'change' },]"
                             :rules="[{ required: false, message: '请选择按钮序号', trigger: 'change' },]"

src/views/modules/taskPlan/taskChainList/index.vue

@@ -124,7 +124,14 @@
                           v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:delete')"></el-divider>
                           v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:delete')"></el-divider>
               <el-button type="text" size="mini"
               <el-button type="text" size="mini"
                          v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:delete')"
                          v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:delete')"
-                         @click="delete(scope.row)">删除
+                         @click="deleteById(scope.row)">删除
+              </el-button>
+
+              <el-divider direction="vertical"
+                          v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:del')"></el-divider>
+              <el-button type="text" size="mini"
+                         v-if="scope.row.taskStatus === '5' && hasPermission('taskChainList:del')"
+                         @click="setTaskStatus(scope.row,'4')">删除
               </el-button>
               </el-button>
             </template>
             </template>
           </vxe-column>
           </vxe-column>
@@ -232,7 +239,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    async delete (row) {
+    async deleteById (row) {
       const can = {
       const can = {
         id: row.id
         id: row.id
       }
       }