Преглед на файлове

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

Min преди 1 година
родител
ревизия
c52cb272df

BIN
fhKeeper/formulahousekeeper/timesheet-workshop/favicon.ico


+ 3 - 2
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/orderInsert.vue

@@ -38,7 +38,7 @@
       </div>
 
       <!-- 各部分数据列表 -->
-      <el-table :data="tableData" style="width: 100%; flex: 1" v-loading="tableDataLoading"
+      <el-table :data="tableData" :height="'0'" style="width: 100%; flex: 1" v-loading="tableDataLoading"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column prop="taskChangeNoticeNum" label="通知号" width="180"></el-table-column>
@@ -916,7 +916,7 @@ export default {
   width: 100%;
   height: 100%;
   display: flex;
-  flex-wrap: wrap;
+  // flex-wrap: wrap;
   flex-direction: column;
   box-sizing: border-box;
   padding: 10px;
@@ -931,6 +931,7 @@ export default {
     flex: 1;
     display: flex;
     flex-direction: column;
+    overflow: auto;
   }
 
   .layout-container-floor {

+ 27 - 9
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="OutSide_center">
           <div class="block">
-            <span class="demonstration">查询以往{{ titleText }}</span>
+            <span class="demonstration">查询{{ titleLeftText }}{{ titleText }}</span>
             <el-date-picker v-model="planDate" type="date" value-format="yyyy-MM-dd" :clearable="false" @change="getTableData(hasChooseDept)"
               placeholder="选择日期" size="small" :picker-options="planType == 1 ? toMPickerOptions : todayPickerOptions">
             </el-date-picker>
@@ -19,8 +19,8 @@
           </div>
         </div>
         <div class="OutSide_right">
-          <el-link type="primary" :underline="false" @click="(deptSetDialog = true), getPlanDeptSet()">{{ "部门设置"
-          }}</el-link>
+          <!-- <el-link type="primary" :underline="false" @click="(deptSetDialog = true), getPlanDeptSet()">{{ "部门设置"
+          }}</el-link> -->
           <el-link type="primary" :underline="false" @click="addPlan()">{{
             `新增${titleText}`
           }}</el-link>
@@ -34,12 +34,18 @@
     </div>
     <div class="layout-container-center">
       <!-- tab 切换 -->
-      <div class="today-tab">
-        <div v-for="(item, index) in hasSetDeptList" :key="index" :class="`${todayTabIndex === index ? 'on' : ''}`"
-          @click="tabChange(item, index)">
-          {{ item.departmentName }}
+      <div class="today-tab-btn">
+        <div class="today-tab">
+          <div v-for="(item, index) in hasSetDeptList" :key="index" :class="`${todayTabIndex === index ? 'on' : ''}`"
+            @click="tabChange(item, index)">
+            {{ item.departmentName }}
+          </div>
+        </div>
+        <div style="margin-left: 15px;" v-if="planType == 0">
+          <el-button type="primary" size="mini" @click="(deptSetDialog = true), getPlanDeptSet()">部门设置</el-button>
         </div>
       </div>
+      
 
       <!-- 各部分数据列表 -->
       <el-table :data="tableData" style="width: 100%;" height="0" v-loading="tableDataLoading"
@@ -72,7 +78,7 @@
         </el-table-column>
         <el-table-column prop="endDate" label="完工时间" width="180">
         </el-table-column>
-        <el-table-column label="编辑">
+        <el-table-column label="操作" :fixed="'right'">
           <template slot-scope="scope">
             <div @click="editPlan(scope.row)" class="colorText">编辑</div>
           </template>
@@ -227,6 +233,9 @@ export default {
     todayDate: {
       type: String,
     },
+    titleLeftText: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -853,6 +862,12 @@ export default {
 };
 </script>
 <style scoped lang='scss'>
+.today-tab-btn {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
 .colorText {
   color: #02a7f0;
   cursor: pointer;
@@ -946,11 +961,14 @@ export default {
   .today-tab {
     display: flex;
     overflow-x: auto;
-    margin-bottom: 10px;
+    align-items: center;
+    max-width: 90%;
+    overflow-x: auto;
 
     div {
       font-size: 16px;
       margin-left: 15px;
+      min-width: fit-content;      
       cursor: pointer;
     }
 

+ 11 - 8
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponentDetil.vue

@@ -1,7 +1,7 @@
 <template>
     <div class='planComponentDetil'>
         <div class="planComponentDetil-top">
-            <div>{{ leftText }}</div>
+            <div style="color: #02A7F0;cursor: pointer;" @click="toBack()"><i class="el-icon-arrow-left" style="padding-right: 10px;"></i>{{ leftText }}</div>
             <div>{{ topText }}</div>
             <div></div>
         </div>
@@ -17,25 +17,25 @@
                 :key="tableKey"
                 style="width: 100%;"
                 v-loading="tableDataLoading">
-                    <el-table-column label="工序名称">
+                    <el-table-column label="工序名称" width="400">
                         <template slot-scope="scope">{{ scope.row.prodProcedure.name }}</template>
                     </el-table-column>
-                    <el-table-column label="单件工时">
+                    <el-table-column label="单件工时" width="150">
                         <template slot-scope="scope">{{ scope.row.prodProcedure.workingTime }}</template>
                     </el-table-column>
-                    <el-table-column label="总工时" width="180">
+                    <el-table-column label="总工时" width="150">
                         <template slot-scope="scope">{{ scope.row.totalWorkingHours }}</template>
                     </el-table-column>
-                    <el-table-column label="单件工价" width="180">
+                    <el-table-column label="单件工价" width="150">
                         <template slot-scope="scope">{{ scope.row.prodProcedure.unitPrice }}</template>
                     </el-table-column>
-                    <el-table-column label="总工价" width="180">
+                    <el-table-column label="总工价">
                         <template slot-scope="scope">{{ scope.row.totalWages }}</template>
                     </el-table-column>
-                    <el-table-column label="质检类型" width="180">
+                    <el-table-column label="质检类型">
                         <template slot-scope="scope">{{ scope.row.prodProcedure.checkType==0?"自检": scope.row.prodProcedure.checkType==1?"互检":"专检"}}</template>
                     </el-table-column>
-                    <el-table-column label="组员" width="180">
+                    <el-table-column label="组员" width="150">
                         <template slot-scope="scope">{{ scope.row.teamNames }}</template>
                     </el-table-column>
                 </el-table>
@@ -127,6 +127,9 @@ export default {
         this.getPlanDetail()
      },
     methods: {
+        toBack() {
+            this.$router.go(-1)
+        },
         tabChange(item, index) {
             this.TabIndex = index
             this.getPlanDetail()

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/today.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='layout-container'>
-    <PlanComponent :planType="'0'" :titleText="'今日计划'" :todayDate="todayDate"></PlanComponent>
+    <PlanComponent :planType="'0'" :titleText="'今日计划'" :titleLeftText="'以往'" :todayDate="todayDate"></PlanComponent>
   </div>
 </template>
 

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/tomorrow.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='layout-container'>
-    <PlanComponent :planType="'1'" :titleText="'明日计划'" :todayDate="todayDate"></PlanComponent>
+    <PlanComponent :planType="'1'" :titleText="'明日计划'" :titleLeftText="'未来'" :todayDate="todayDate"></PlanComponent>
   </div>
 </template>