Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -357,8 +357,9 @@
                     </div>
                     <div class="cost-info-li">
                         <!-- 客户名单 -->
-                        <el-popover placement="bottom" width="952" trigger="hover">
-                            <el-table max-height="600" border :data="rollcallarr">
+                        <el-popover class="clientinfo" placement="bottom" width="952" trigger="hover">
+                            <el-table :cell-style="{ 'text-align': 'center' }" :header-cell-style="{ 'text-align': 'center' }"
+                                max-height="600" border :data="rollcallarr">
                                 <el-table-column width="100" property="date" label="姓名" align="center">
                                     <template slot-scope="scope">
                                         {{ scope.row.lastName }}{{ scope.row.firstName }}
@@ -6369,4 +6370,8 @@ export default {
     display: flex;
     justify-content: center;
 }
+
+.cost-all .el-table th.el-table__cell>.cell {
+    text-align: center;
+}
 </style>

src/components/OP/PickupList.vue

@@ -39,8 +39,7 @@
                 <el-upload class="upload-demo" ref="upload" action="" :on-change="httpRequest" :on-remove="httpRequest"
                     accept=".png, .jpg, .jpeg" :limit="1" :file-list="fileList" :auto-upload="false">
                     <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                    <el-button style="margin-left: 10px;" size="small" type="success"
-                        @click="submitUpload">识别图片</el-button>
+                    <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">识别图片</el-button>
                 </el-upload>
             </div>
             <div class="pickuplist-table">
@@ -68,8 +67,8 @@
                                 type="text" size="small">
                                 详细
                             </el-button>
-                            <el-button @click.native.prevent="PostTourClientListDel(scope.$index, scope.row)"
-                                type="text" size="small">
+                            <el-button @click.native.prevent="PostTourClientListDel(scope.$index, scope.row)" type="text"
+                                size="small">
                                 删除
                             </el-button>
                         </template>
@@ -218,8 +217,7 @@
                         <template slot-scope="scope">
                             <el-select size="mini" style="width:100%" v-model="scope.row.shippingSpaceTypeId" clearable
                                 filterable placeholder="请选择">
-                                <el-option v-for="item in cangweiType" :key="item.id" :label="item.name"
-                                    :value="item.id">
+                                <el-option v-for="item in cangweiType" :key="item.id" :label="item.name" :value="item.id">
                                 </el-option>
                             </el-select>
                         </template>
@@ -1378,7 +1376,8 @@ export default {
 .dialog-hade label {
     color: red;
 }
-
+</style>
+<style scoped>
 .dutzl .el-dialog__body {
     padding-top: 0;
 }