财务调整

src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -168,7 +168,7 @@
           <vxe-column width="100" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
           <vxe-column width="100" title="状态" fixed="right" align="center" field="type">
             <template #default="scope">
-              <el-button text @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
+              <el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
             </template>
           </vxe-column>
 

src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -104,7 +104,6 @@
           <vxe-column  min-width="150px" align="center" fixed="right" title="状态" field="status" >
             <template #default="scope">
               <el-button  @click="detail(scope.row)" effect="dark"
-						  text
                           :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status, '-')">
                 {{$dictUtils.getDictLabel("cw_status", scope.row.status, '-')}}
               </el-button>

src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -136,7 +136,6 @@
           <vxe-column  min-width="150px" align="center" fixed="right" title="作废归档状态" field="applyFileType" >
             <template #default="scope">
               <el-button  @click="detail(scope.row)" effect="dark"
-						  text
                           :type="$dictUtils.getDictLabel('filed_type_status', scope.row.applyFileType, '')">
                 {{$dictUtils.getDictLabel("filed_type", scope.row.applyFileType, '-')}}
               </el-button>

src/views/cw/workClientInfo/WorkClientAddForm.vue

@@ -717,7 +717,7 @@
 </template>
 
 <script>
-  import UpLoadComponent from '@/views/common/UpLoadComponent'
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from './clientUserSelect'
   import workClientService from '@/api/cw/workClientInfo/WorkClientService'
@@ -742,7 +742,6 @@
     },
     data () {
       return {
-      	sexOptions: [], //存储性别选项的数据属性
         title: '',
         method: '',
         loading: false,

src/views/cw/workClientInfo/WorkClientList.vue

@@ -179,8 +179,8 @@
           <vxe-column title="操作" width="140px" fixed="right" align="center">
             <template  #default="scope">
               <div v-if="isAdmin">
-                <el-button v-if="(scope.row.status==='0'||scope.row.status==='5')" type="primary"  size="small" @click="edit(scope.row.id)">修改</el-button>
-                <el-button v-if="(scope.row.status==='0'||scope.row.status==='5')" type="primary"   size="small" @click="del(scope.row.id)">删除</el-button>
+                <el-button v-if="(scope.row.status==='0'||scope.row.status==='5')" text type="primary"  size="small" @click="edit(scope.row.id)">修改</el-button>
+                <el-button v-if="(scope.row.status==='0'||scope.row.status==='5')" text type="primary"   size="small" @click="del(scope.row.id)">删除</el-button>
               </div>
               <div v-else>
                 <!--              拥有人修改-->

src/views/cw/workClientInfo/WorkClientListForm.vue

@@ -11,17 +11,17 @@
       @keyup.enter.native="getWorkClient"
       v-model="visible">
       <div style="height: calc(100%);">
-        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
+        <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
           <!-- 搜索框-->
           <el-form-item label="客户姓名" prop="name">
-            <el-input size="small" v-model="searchForm.name" placeholder="请输入客户姓名" clearable></el-input>
+            <el-input v-model="searchForm.name" placeholder="请输入客户姓名" clearable></el-input>
           </el-form-item>
           <el-form-item label="客户编号" prop="no">
-            <el-input size="small" v-model="searchForm.no" placeholder="请输入客户编号" clearable></el-input>
+            <el-input v-model="searchForm.no" placeholder="请输入客户编号" clearable></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
-            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+            <el-button type="primary" @click="list()" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" icon="el-icon-refresh-right">重置</el-button>
           </el-form-item>
         </el-form>
 
@@ -31,7 +31,6 @@
           resizable
           height="400px"
           :loading="loading"
-          size="small"
           ref="clientTable"
           show-header-overflow
           show-overflow
@@ -43,16 +42,16 @@
           :row-config="{isCurrent: true}"
           :checkbox-config="{trigger: 'row'}">
           <vxe-column type="seq" width="40"></vxe-column>
-          <vxe-column type="checkbox" width="40px"></vxe-column>
+          <vxe-column type="checkbox" width="60px"></vxe-column>
           <vxe-column width="" title="客户名称" align="center" field="name"></vxe-column>
           <vxe-column width="" title="客户编号" align="center" field="no"></vxe-column>
           <vxe-column width="" title="客户类型" align="center" field="type">
-            <template slot-scope="scope">
+            <template #default="scope">
               {{$dictUtils.getDictLabel('cw_work_client_type', scope.row.type, '-')}}
             </template>
           </vxe-column>
           <vxe-column width="" title="所属行业" align="center" field="industry">
-            <template slot-scope="scope">
+            <template #default="scope">
               {{$dictUtils.getDictLabel('cw_work_client_industry', scope.row.industry, '-')}}
             </template>
           </vxe-column>
@@ -60,7 +59,6 @@
         </vxe-table>
         <vxe-pager
           background
-          size="small"
           :current-page="tablePage.currentPage"
           :page-size="tablePage.pageSize"
           :total="tablePage.total"
@@ -69,10 +67,12 @@
           @page-change="currentChangeHandle">
         </vxe-pager>
       </div>
-      <span slot="footer" class="dialog-footer">
-      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
-      <el-button size="small" type="primary" v-if="method != 'view'" @click="getWorkClient()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
-    </span>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" v-if="method != 'view'" @click="getWorkClient()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
     </el-dialog>
   </div>
 </template>

src/views/cw/workClientInfo/clientUserSelect/UserSelectDialog.vue

@@ -328,7 +328,7 @@
           this.searchForm.selectAll = 'true'
         }
         this.$http({
-          url: '/system-server/sys/user/list2',
+          url: '/system-server/sys/user/list',
           method: 'get',
           params: {
             'current': this.pageNo,