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

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -0,0 +1,187 @@
+<template>
+  <div class="distribution">
+    <van-nav-bar title="报工" left-text="返回"  @click-left="back" fixed left-arrow/>
+    <div class="distribution_header">
+        <div>东湾2号线电池箱</div>
+        <div>00001</div>
+        <div>20230620</div>
+      </div>
+
+    <van-form @submit="onSubmit">
+      <van-cell-group inset>
+
+        <van-cell title="工序" value="xxxxx" />
+        <van-field type="digit" input-align="right"
+          v-model="reportForm.progress"
+          name="进度"
+          label="进度(%)"
+          placeholder="%"
+          :rules="[{ required: true, message: '请填写整数' }]"
+        />
+        <van-cell title="质检类型" value="自检" />
+        <van-cell title="质检人" value="小昂" is-link>
+
+        </van-cell>
+      </van-cell-group>
+      <div style="margin: 16px;">
+        <van-button round block type="primary" native-type="submit">
+          提交
+        </van-button>
+      </div>
+    </van-form>
+    <!-- 弹出层选人 -->
+    <van-popup v-model="popupShow" round position="bottom" :style="{ height: '80%',background: '#F4F4F4' }" >
+    </van-popup>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  components: {
+  },
+  data() {
+    return {
+      reportForm: {
+        progress: 10,
+
+
+      },
+      distributionIndex: null,
+      popupShow: false,
+      titleText: '今日计划', // 默认文字
+      todayAndTomorrow: true, // true 今日计划，false 明日计划
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {
+    this.getMyPlanProcedureList();
+  },
+  methods: {
+    back() {
+      this.$router.go(-1);
+    },
+    // 下单计划
+    placeAnOrder() {
+      console.log('点击了下单计划')
+    },
+    distributionProp(item, index) {
+      this.distributionIndex = index
+      this.popupShow = true
+    },
+
+    getMyPlanProcedureList() {
+      const toast = this.$toast.loading({
+          forbidClick: true,
+          duration: 0
+      });
+      this.$axios.post("/plan-procedure-total/getReportForWorkList", this.form)
+      .then(res => {
+          if(res.code == "ok") {
+              this.$toast.clear();
+              this.$toast.success('登录成功');
+              
+          } else {
+              this.$toast.clear();
+              this.$toast.fail(res.msg);
+          }
+      }).catch(err=> {this.$toast.clear();});
+    },
+
+    //打开报工页面
+    reportItem(item) {
+        
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+  * {
+    box-sizing: border-box;
+  }
+  .valueCls {
+    color:#20a0ff;
+    margin-top: 5px;
+    margin-bottom: 5px;;
+  }
+  .labelCls {
+    color:#666;
+  }
+  .distribution {
+    width: 100%;
+    height: 100%;
+    padding: 54px 15px 15px 15px;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    background-color: #F4F4F4;
+    color: #333;
+
+    .distribution_header {
+      font-size: 16px;
+      div {
+        margin-top: 6px;
+      }
+    }
+
+    .distribution_con {
+      flex: 1;
+      overflow: auto;
+      margin-top: 14px;
+
+      .distribution_box {
+        width: 100%;
+        background-color: #fff;
+        border-radius: 4px;
+        padding: 10px;
+        margin-bottom: 15px;
+        position: relative;
+        overflow: hidden;
+
+        .distribution_ItemBom {
+          font-size: 16px;
+          display: flex;
+          flex-wrap: wrap;
+          padding: 0px 6px 6px 6px;
+
+          .PlanItem {
+            width: 50%;
+            display: flex;
+            padding-top: 12px;
+
+            &:first-child {
+              width: 100%;
+              padding-top: 10px;
+              span {
+                font-size: 18px;
+                color: #333;
+              }
+            }
+
+            &:nth-child(2) {
+              width: 100%;
+              span {
+                width: 230px;
+                word-break: break-all;
+              }
+            }
+
+            div {
+              width: 80px;
+              text-align: right;
+              color: #666;
+            }
+
+            span {
+              display: inline-block;
+              color: #333;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -0,0 +1,70 @@
+<template>
+    <section>
+        <el-empty>待完善</el-empty>
+    </section>
+</template>
+
+<script>
+// 引入自定义组件
+    import selectCat from "@/components/select.vue"
+    //引入自定义级联组件
+    import vueCascader from "@/components/cascader.vue"
+
+    import util from "../../common/js/util";
+    export default {
+        components: {
+            selectCat,
+            vueCascader
+        },
+        data() {
+            return {
+                
+            };
+        },
+        methods: {
+            
+        },
+        created() {
+            this.myChart = null
+        },
+        mounted() {
+            this.containerHeight = window.innerHeight - 200
+            // this.containerHeight = window.innerHeight - 130
+            const that = this;
+            window.onresize = function temp() {
+                this.containerHeight = window.innerHeight - 130
+                // this.containerHeight = window.innerHeight - 200
+            };
+           
+        },
+        beforeDestroy () {
+        },
+    };
+</script>
+
+<style lang="scss" scoped>
+    #container {
+        // display: inline-block;
+        display: block;
+        position: absolute;
+        // width: 100% !important; 
+        margin-top: 60px;
+    } 
+    .ryuans {
+        top: -50px;
+    }
+    .prompt {
+        position: absolute;
+        right: 10px;
+        top: 0;
+    }
+    .poss {
+        position: fixed;
+        bottom: 10px;
+        right: 1%;
+        box-sizing: border-box;
+    }
+</style>
+
+<style lang="scss">
+</style>