소스 검색

040811714lhj

liuhj 1 년 전
부모
커밋
759f59ae16
2개의 변경된 파일20개의 추가작업 그리고 15개의 파일을 삭제
  1. 19 13
      src/components/Finance/Cost.vue
  2. 1 2
      src/components/system/Payroll.vue

+ 19 - 13
src/components/Finance/Cost.vue

@@ -261,10 +261,10 @@
                         </template>
                         <template slot-scope="scope">
                             <div v-if="item.prop === 'sales'">
-                                <el-input :ref="'el-input-' + index" v-model="scope.row[item.prop]" show-word-limit />
+                                <el-input size="mini" :ref="'el-input-' + index" v-model="scope.row[item.prop]" show-word-limit />
                             </div>
                             <div v-else-if="item.prop === 'day'">
-                                <el-input :ref="'el-input-' + index" v-model="scope.row[item.prop]" type="number"
+                                <el-input size="mini" :ref="'el-input-' + index" v-model="scope.row[item.prop]" type="number"
                                     min="0" @change="NumberSetTime(scope.row[item.prop], scope.$index)" />
                             </div>
                             <div v-else-if="item.prop === 'date'">
@@ -273,11 +273,11 @@
                                         v-model="scope.row[item.prop]"
                                         @change="dateChange(scope.row[item.prop], scope.$index)">
                                     </el-input> -->
-                                    <el-date-picker v-model="scope.row[item.prop]" type="date" value-format="yyyy-MM-dd"
+                                    <el-date-picker size="mini" v-model="scope.row[item.prop]" type="date" value-format="yyyy-MM-dd"
                                         placeholder="选择日期">
                                     </el-date-picker>
                                 </span>
-                                <div>
+                                <div style="position: absolute;left: 36%;">
                                     {{ GetWeek(scope.row[item.prop]) }}
                                 </div>
                             </div>
@@ -313,7 +313,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <el-input slot="reference" placeholder="请输入内容" v-model="scope.row[item.prop]">
+                                    <el-input size="mini" slot="reference" placeholder="请输入内容" v-model="scope.row[item.prop]">
                                     </el-input>
                                 </el-popover>
                             </div>
@@ -331,27 +331,28 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <el-input slot="reference" placeholder="请输入内容" v-model="scope.row[item.prop]">
+                                    <el-input size="mini" slot="reference" placeholder="请输入内容" v-model="scope.row[item.prop]">
                                     </el-input>
                                 </el-popover>
                             </div>
-                            <span v-else :title="scope.row[item.prop]"><el-input placeholder="请输入内容"
+                            <span v-else :title="scope.row[item.prop]">
+                                <el-input size="mini" placeholder="请输入内容"
                                     v-model="scope.row[item.prop]">
                                 </el-input></span>
                         </template>
                     </el-table-column>
                 </template>
-                <el-table-column label="操作" :width="200">
+                <el-table-column class="czbtn" label="操作" :width="200">
                     <!-- eslint-disable-next-line -->
                     <template slot-scope="scope">
-                        <el-button size="mini" @click="insertRow(scope.$index, scope.row, 'UP')" type="primary">插入行
+                        <el-button class="czbtn" size="mini" @click="insertRow(scope.$index, scope.row, 'UP')" type="primary">插入行
                             ↑</el-button>
                         <br />
-                        <el-button style="margin: 10px;" size="mini"
+                        <el-button class="czbtn" style="margin: 10px;" size="mini"
                             @click="handleDelete(scope.$index, scope.row, tableData)" type="danger">删除<i
                                 class="el-icon-delete"></i></el-button>
                         <br />
-                        <el-button size="mini" @click="insertRow(scope.$index, scope.row, 'DOWN')" type="primary">插入行
+                        <el-button class="czbtn" size="mini" @click="insertRow(scope.$index, scope.row, 'DOWN')" type="primary">插入行
                             ↓</el-button>
 
                     </template>
@@ -386,6 +387,7 @@
                                         <el-table-column
                                             v-for="(      itemsheetone, index      ) in       sheetitem.childList      "
                                             :key="index" :prop="itemsheetone.prop" :label="itemsheetone.childLabel">
+                                            <!-- eslint-disable-next-line -->
                                             <template slot-scope="scope">
                                                 <div v-if="itemsheetone.prop.indexOf(sheetitem.EnLabel) != -1">
                                                     <div v-if="itemsheetone.isBind">
@@ -471,6 +473,7 @@
                                         <el-table-column
                                             v-for="(      itemsheetone, index      ) in       sheetitem.childList      "
                                             :key="index" :prop="itemsheetone.prop" :label="itemsheetone.childLabel">
+                                            <!-- eslint-disable-next-line -->
                                             <template slot-scope="scope">
                                                 <div v-if="itemsheetone.prop.indexOf(sheetitem.EnLabel) != -1">
                                                     <div v-if="itemsheetone.isBind">
@@ -715,8 +718,8 @@ export default {
                 { label: 'E/C T', tips: '会务费(EXPO/CONFERENCE TICKET)' }
             ],
             tableLabel: [
-                { label: 'DAY', width: '90', prop: 'day', describe: '天数(DAY)' },
-                { label: 'DATE', width: '180', prop: 'date', describe: '时间(DATE)' },
+                { label: 'DAY', width: '85', prop: 'day', describe: '天数(DAY)' },
+                { label: 'DATE', width: '151', prop: 'date', describe: '时间(DATE)' },
                 { label: 'ITIN', width: '200', prop: 'itin', describe: '行程描述(ITINERARY)' },
                 { label: 'VA', width: '85', prop: 'sale', describe: '车服务区域(Vehicle Area)' }, // ??????????????
                 { label: 'VT', width: '200', prop: 'carType', describe: '车型(VEHICLE TYPE)' },
@@ -4717,4 +4720,7 @@ export default {
 .biaogeKz .el-table .el-input--small {
     width: 60%;
 }
+.czbtn{
+    width: 70px;
+}
 </style>

+ 1 - 2
src/components/system/Payroll.vue

@@ -71,8 +71,7 @@
                         </el-table-column>
                         <el-table-column
                             prop="companyName"
-                            label="公司"
-                            width="170">
+                            label="公司">
                         </el-table-column>
                         <el-table-column
                             label="假勤/打卡"