fix

src/views/oa/AssetInDetailList.vue

@@ -135,19 +135,16 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          
+          <a @click="handleEdit(record.cdAssetInId)">编辑</a>
 
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a @click="print(record)">打印</a>
+          
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.cdAssetInId)">
+            <a>删除</a>
+          </a-popconfirm>
         </span>
 
       </a-table>
@@ -347,24 +344,25 @@
             dataIndex: 'action',
             align:"center",
             width:160,
-            customRender: (value, row, index) => {
-              const obj = {
-                children:
-                  (
-                  <span>
-                  <a id="btn"  onClick={() => this.handleEdit(row.cdAssetInId)}>编辑   </a>
-                    <a-divider type="vertical" />
-                    <a id="btn"  onClick={() => this.print(row)}>打印</a>
-                    <a-divider type="vertical" />
-                    <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.cdAssetInId)} placement="topRight">
-                         <a>删除</a>
-                       </a-popconfirm>
-                    </span> ),
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            scopedSlots: { customRender: 'action' },
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children:
+            //       (
+            //       <span>
+            //       <a id="btn"  onClick={() => this.handleEdit(row.cdAssetInId)}>编辑   </a>
+            //         <a-divider type="vertical" />
+            //         <a id="btn"  onClick={() => this.print(row)}>打印</a>
+            //         <a-divider type="vertical" />
+            //         <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.cdAssetInId)} placement="topRight">
+            //              <a>删除</a>
+            //            </a-popconfirm>
+            //         </span> ),
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           }
         ],
         url: {

src/views/oa/BudgetCostList.vue

@@ -127,17 +127,14 @@
         </template>
         <template slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a @click="print(record)">打印</a>
+          
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
         </template>
 <!--        <span slot="action" slot-scope="text, record">-->
 <!--          <a @click="handleEdit(record)">编辑</a>-->
@@ -287,24 +284,25 @@
             width:150,
             align:"center",
             fixed: 'right',
-            customRender: (value, row, index) => {
-              const obj = {
-                children:
-                  (
-                  <span>
-                  <a id="btn"  onClick={() => this.handleEdit(row)}>编辑   </a>
-                    <a-divider type="vertical" />
-                  <a id="btn"  onClick={() => this.print(row)}>打印 </a>
-                    <a-divider type="vertical" />
-                    <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.id)} placement="topRight">
-                         <a>删除</a>
-                       </a-popconfirm>
-                    </span> ),
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            scopedSlots: { customRender: 'action' },
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children:
+            //       (
+            //       <span>
+            //       <a id="btn"  onClick={() => this.handleEdit(row)}>编辑   </a>
+            //         <a-divider type="vertical" />
+            //       <a id="btn"  onClick={() => this.print(row)}>打印 </a>
+            //         <a-divider type="vertical" />
+            //         <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.id)} placement="topRight">
+            //              <a>删除</a>
+            //            </a-popconfirm>
+            //         </span> ),
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           }
         ],
         url: {

src/views/oa/CarList.vue

@@ -63,10 +63,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('车辆信息')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('车辆信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

src/views/oa/CarfareDetailList.vue

@@ -118,21 +118,16 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          
+          <a @click="handleEdit(record.cdCarfareId)">编辑</a>
 
           <a-divider type="vertical" />
+          <a @click="print(record)">打印</a>
           
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.cdCarfareId)">
+            <a>删除</a>
+          </a-popconfirm>
         </span>
 
       </a-table>
@@ -257,24 +252,25 @@
             title: '操作',
             dataIndex: 'action',
             align:"center",
-            customRender: (value, row, index) => {
-              const obj = {
-                children:
-                  (
-                  <span>
-                  <a id="btn"  onClick={() => this.handleEdit(row.cdCarfareId)}>编辑   </a>
-                    <a-divider type="vertical" />
-                    <a onClick={()=>this.print(row)}>打印</a>
-                    <a-divider type="vertical" />
-                    <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.cdCarfareId)} placement="topRight">
-                         <a>删除</a>
-                       </a-popconfirm>
-                    </span> ),
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            scopedSlots: { customRender: 'action' },
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children:
+            //       (
+            //       <span>
+            //       <a id="btn"  onClick={() => this.handleEdit(row.cdCarfareId)}>编辑   </a>
+            //         <a-divider type="vertical" />
+            //         <a onClick={()=>this.print(row)}>打印</a>
+            //         <a-divider type="vertical" />
+            //         <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.cdCarfareId)} placement="topRight">
+            //              <a>删除</a>
+            //            </a-popconfirm>
+            //         </span> ),
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           }
         ],
         url: {

src/views/oa/MaterialInDetailList.vue

@@ -115,19 +115,16 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          
+          <a @click="handleEdit(record.cdMaterialInId)">编辑</a>
 
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a @click="print(record)">打印</a>
+          
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.cdMaterialInId)">
+            <a>删除</a>
+          </a-popconfirm>
         </span>
 
       </a-table>
@@ -252,24 +249,25 @@
             title: '操作',
             dataIndex: 'action',
             align:"center",
-            customRender: (value, row, index) => {
-              const obj = {
-                children:
-                  (
-                  <span>
-                  <a id="btn"  onClick={() => this.handleEdit(row.cdMaterialInId)}>编辑   </a>
-                    <a-divider type="vertical" />
-                  <a id="btn"  onClick={() => this.print(row)}>打印</a>
-                  <a-divider type="vertical" />
-                    <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.cdMaterialInId)} placement="topRight">
-                         <a>删除</a>
-                       </a-popconfirm>
-                    </span> ),
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            scopedSlots: { customRender: 'action' },
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children:
+            //       (
+            //       <span>
+            //       <a id="btn"  onClick={() => this.handleEdit(row.cdMaterialInId)}>编辑   </a>
+            //         <a-divider type="vertical" />
+            //       <a id="btn"  onClick={() => this.print(row)}>打印</a>
+            //       <a-divider type="vertical" />
+            //         <a-popconfirm title="确定删除吗?" onConfirm={() => this.handleDelete(row.cdMaterialInId)} placement="topRight">
+            //              <a>删除</a>
+            //            </a-popconfirm>
+            //         </span> ),
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           }
         ],
         url: {

src/views/oa/MeetingRoomList.vue

@@ -13,10 +13,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('会议室管理')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('会议室管理')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>

src/views/oa/enterpriseAnnouncement.vue

@@ -121,9 +121,9 @@
 
           <!-- 操作 -->
           <span slot="operationSlot" slot-scope="text, record">
-            <a href="javascript:void(0);" @click="editAnn(record)">编辑</a>
+            <a href="javascript:void(0);" @click="editAnn(record)"  v-if="record.isRelease == '0'">编辑</a>
 
-            <a-divider type="vertical" v-if="record.isRelease == '0'" />
+            <a-divider type="vertical" v-if="record.isRelease == '0'"  />
 
             <!-- 判断是否发布 -->
             <a-popconfirm
@@ -149,7 +149,7 @@
 
             <a-divider type="vertical" />
 
-            <a-popconfirm title="确定删除吗？" ok-text="是" cancel-text="否" @confirm="delAnn(record)">
+            <a-popconfirm title="确定删除吗？" ok-text="是" cancel-text="否" @confirm="delAnn(record)" >
               <a href="javascript:void(0);" class="delRed">删除</a>
             </a-popconfirm>
           </span>
@@ -317,13 +317,17 @@ export default {
         // 删除公告
         delAnn (record) {
             console.log('点击公告对象', record)
-            enterpriseEDelete({ id: record.id }).then(res => {
-                if (res.success) {
-                    console.log(res)
-                    this.getAnnList()
-                    this.$message.success('删除成功')
-                }
-            })
+            if(record.isRelease=='1'){
+                this.$message.warning('已发布不能删除！请先取消发布')
+            }else{
+              enterpriseEDelete({ id: record.id }).then(res => {
+                  if (res.success) {
+                      console.log(res)
+                      this.getAnnList()
+                      this.$message.success('删除成功')
+                  }
+              })
+            }
         },
         // 取消发布
         saveAnn (id) {

src/views/process-center/applyListByTableName.vue

@@ -13,16 +13,6 @@
             </a-form-item>
           </a-col> -->
           
-          <!-- <a-col :md="4" :sm="12">
-            <a-form-item label="结果">
-              <a-select v-model="queryParam.result" placeholder="请选择" :allowClear="true">
-                <a-select-option value="0">未提交</a-select-option>
-                <a-select-option value="1">处理中</a-select-option>
-                <a-select-option value="2">通过</a-select-option>
-                <a-select-option value="3">驳回</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col> -->
           <a-col :md="6" :sm="12">
             <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
@@ -36,6 +26,16 @@
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="12">
+            <a-form-item label="结果">
+              <a-select v-model="queryParam.result" placeholder="请选择" :allowClear="true">
+                <a-select-option value="0">未提交</a-select-option>
+                <a-select-option value="1">处理中</a-select-option>
+                <a-select-option value="2">已通过</a-select-option>
+                <a-select-option value="3">已驳回</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :md="4" :sm="12">
             <a-form-item label="状态">
               <a-select v-model="queryParam.status" placeholder="请选择" :allowClear="true">
                 <a-select-option value="0">草稿</a-select-option>
@@ -44,7 +44,7 @@
                 <a-select-option value="3">已撤回</a-select-option>
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <!-- 查询 重置 -->
           <a-col :md="12" :sm="12">
             

src/views/system/RoleList.vue

@@ -31,10 +31,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
 
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">

src/views/system/RoleUserList.vue

@@ -34,10 +34,10 @@
         <div class="table-operator" style="margin: 5px 0 10px 2px">
           <a-button @click="handleAdd" type="primary" icon="plus">角色录入</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" v-show="showOP">
+          <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" v-show="showOP">
             <a-button type="primary" icon="import">导入</a-button>
           </a-upload>
-          <a-button type="primary" icon="download" @click="handleExportXls" v-show="showOP">导出</a-button>
+          <a-button type="primary" icon="download" @click="handleExportXls" v-show="showOP">导出</a-button> -->
         </div>
 
         <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">

src/views/system/SysPositionList.vue

@@ -42,10 +42,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">