src/views/oa/AssetInDetailList.vue

@@ -184,13 +184,16 @@
             key:'rowIndex',
             width:60,
             align:"center",
-            customRender: (value, row, index) => {
-              const obj = {
-                children: parseInt(index)+1,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: parseInt(index)+1,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
             }
           },
           {
@@ -283,40 +286,40 @@
             title:'入库人',
             align:"center",
             dataIndex: 'operator',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title:'入库部门',
             align:"center",
             dataIndex: 'operatorDept',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title:'入库日期',
             align:"center",
             dataIndex: 'operatorDate',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title: '操作',

src/views/oa/AssetList.vue

@@ -47,7 +47,12 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="资产状态">
-                <a-input placeholder="请输入资产状态" v-model="queryParam.state"></a-input>
+                <a-select   v-model="queryParam.state">
+                  <a-select-option value="正在使用">正在使用</a-select-option>
+                  <a-select-option value="闲置">闲置</a-select-option>
+                  <a-select-option value="报废">报废</a-select-option>
+                  <a-select-option value="报损">报损</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
           </template>

src/views/oa/CarfareDetailList.vue

@@ -168,53 +168,56 @@
             key:'rowIndex',
             width:60,
             align:"center",
-            customRender: (value, row, index) => {
-              const obj = {
-                children: parseInt(index)+1,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: parseInt(index)+1,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
             }
           },
           {
             title:'登记人',
             align:"center",
             dataIndex: 'registrant',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title:'登记部门',
             align:"center",
             dataIndex: 'registrantDept',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title:'财务经办人',
             align:"center",
             dataIndex: 'financeOperator',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title:'报销人',

src/views/oa/MaterialInDetailList.vue

@@ -163,13 +163,16 @@
             key:'rowIndex',
             width:60,
             align:"center",
-            customRender: (value, row, index) => {
-              const obj = {
-                children: parseInt(index)+1,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: parseInt(index)+1,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
             }
           },
           {
@@ -206,40 +209,40 @@
             title:'入库人',
             align:"center",
             dataIndex: 'operator',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title:'入库部门',
             align:"center",
             dataIndex: 'operatorDept',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: value,
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: value,
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title:'入库日期',
             align:"center",
             dataIndex: 'operateDate',
-            customRender: (value, row, index) => {
-              const obj = {
-                children: !value?"":(value.length>10?value.substr(0,10):value),
-                attrs: {},
-              };
-              obj.attrs.rowSpan = this.myArray[index];
-              return obj
-            }
+            // customRender: (value, row, index) => {
+            //   const obj = {
+            //     children: !value?"":(value.length>10?value.substr(0,10):value),
+            //     attrs: {},
+            //   };
+            //   obj.attrs.rowSpan = this.myArray[index];
+            //   return obj
+            // }
           },
           {
             title: '操作',

src/views/oa/SealArchivesList.vue

@@ -27,7 +27,10 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="印章状态">
-                <a-input placeholder="请输入印章状态" v-model="queryParam.sealStatus"></a-input>
+                <a-select placeholder="请选择印章状态" v-model="queryParam.sealStatus" >
+                  <a-select-option value="正在使用">正在使用</a-select-option>
+                  <a-select-option value="已销毁">已销毁</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">

src/views/oa/SealDestroyList.vue

@@ -59,12 +59,12 @@
 <!--      <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-dropdown v-if="selectedRowKeys.length > 0">
+      <!-- <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>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
@@ -110,7 +110,7 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -120,7 +120,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>

src/views/oa/SealTurnList.vue

@@ -69,12 +69,12 @@
 <!--      <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-dropdown v-if="selectedRowKeys.length > 0">
+      <!-- <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>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
@@ -120,7 +120,7 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -130,7 +130,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>