Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

2021-12-23 17:11:44 +08:00 · 2021-12-23 17:11:44 +08:00 · 497c20bf08
parent dc5d7ff48e 2e73713bae
commit 497c20bf08
8 changed files with 87 additions and 75 deletions
--- a/hb_client/src/App.vue
+++ b/hb_client/src/App.vue
@ -60,4 +60,7 @@ export default {
  #customerForm .el-form-item{
    margin-bottom: 30px!important;
  }
+  .overFlowShow .el-tabs__content{
+    overflow: visible;
+  }
 </style>
--- a/hb_client/src/components/Gantt/components/leftMenu.vue
+++ b/hb_client/src/components/Gantt/components/leftMenu.vue
@ -19,11 +19,19 @@
      @expand-change="handlerExpand"
      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
    >
-      <el-table-column label="名称">
+      <el-table-column label="任务编号">
        <template slot-scope="scope">{{ scope.row.name }}</template>
      </el-table-column>
-      <el-table-column label="进度">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+      <el-table-column label="产品名称">
+        <template slot-scope="scope">
+          <div style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;">{{ scope.row.productName }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品型号">
+        <template slot-scope="scope">{{ scope.row.productNum }}</template>
+      </el-table-column>
+      <el-table-column label="生产数量">
+        <template slot-scope="scope">{{ scope.row.per }}</template>
      </el-table-column>
    </el-table>
  </div>
@ -44,19 +52,12 @@ export default {
    BGScrollTop: {
      handler: function(newValue) {
        let table = this.$refs.tableMenu.bodyWrapper;
-        // console.log(newValue, table);
        table.scrollTo(0, newValue);
-        // table.scrollTo({
-        //   top: newValue,
-        //   left: 0,
-        //   behavior: "smooth"
-        // });
      }
    }
  },
  data() {
    return {
-      // tableData: [],
      checkList: [],
      isShowHeaderBox: false,
      menuOpen: false,
@ -68,7 +69,6 @@ export default {
    handlerWatchScroll() {
      let table = this.$refs.tableMenu.bodyWrapper;
      table.addEventListener("scroll", e => {
-        // console.log(e.srcElement.scrollTop);
        this.$emit("TableScrollTop", e.srcElement.scrollTop);
      });
    },
--- a/hb_client/src/components/Gantt/index.vue
+++ b/hb_client/src/components/Gantt/index.vue
@ -1,6 +1,6 @@
 <template>
  <div>
-    <el-row style="position: fixed;z-index: 2000;top: 465px;right: 10px;">
+    <el-row style="position: absolute;z-index: 2000;top: -38px;right: 150px;display: flex">
      <el-date-picker
        v-model="timeRange"
        type="monthrange"
@ -11,8 +11,30 @@
        value-format="yyyy-MM"
        @change="timeRangeChange"
      >
-        <!--test-->
      </el-date-picker>
+      <div
+        class="toolTip"
+        style="width: 60px;height: 35px;padding-left: 10px; background: white;margin-left: 10px;border: 1px solid #DCDFE6;line-height: 35px;border-radius: 4px"
+      >
+        <el-dropdown trigger="click">
+            <span class="base">
+              {{currentDaySize.label}}
+              <i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+          <el-dropdown-menu
+            slot="dropdown"
+            :style="{ left: this.left + 'px !important' }"
+          >
+            <el-dropdown-item
+              v-for="item in currentDaySizeOptions"
+              :key="item.value + 'ee'"
+              @click.native="handleSetDaySize(item)"
+            >
+              {{ item.label }}
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
    </el-row>
    <div class="left" style=" width: 400px ;float: left;border-right: 1px solid #f7f7f7">
      <leftMenu
@ -33,24 +55,6 @@
      ></div>
    </div>
    <div class="chart" ref="chart">
-      <!--<div class="left" :style="{ width: rightLineX + 'px' }">
-        <leftMenu
-          :list="list"
-          ref="leftMenu"
-          :BGScrollTop.sync="BGScrollTop"
-          @TableScrollTop="TableScrollTop"
-          @handlerRowClick="handlerRowClick"
-          @handlerGroup="handlerGroup"
-          @handlerExpand="handlerExpand"
-        ></leftMenu>
-        <div class="rightLine" :style="{ left: rightLineX + 'px' }"></div>
-        <div
-          class="rightLine"
-          :style="{ left: rightLineX + 'px' }"
-          ref="rightLine"
-          @mousedown="rightLineMousedown"
-        ></div>
-      </div>-->
      <div class="date">
        <div class="years" v-for="item in allDays" :key="item.year">
          <div
@ -241,27 +245,7 @@
            </template>
          </div>
        </div>
-        <div class="toolTip">
-          <!--<div class="today base" @click="handleGoToday">今天</div>-->
-          <el-dropdown trigger="click">
-            <span class="base">
-              {{currentDaySize.label}}
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <el-dropdown-menu
-              slot="dropdown"
-              :style="{ left: this.left + 'px !important' }"
-            >
-              <el-dropdown-item
-                v-for="item in currentDaySizeOptions"
-                :key="item.value + 'ee'"
-                @click.native="handleSetDaySize(item)"
-              >
-                {{ item.label }}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
+
        <transition name="el-zoom-in-center">
          <div
            v-show="isShowMsg"
@ -1055,7 +1039,7 @@

 <style lang="scss" scoped>
  .chart {
-    height: 40vh;
+    height: 280px;
    user-select: none;
    position: relative;
    overflow: hidden;
@ -1165,10 +1149,6 @@
      }

      .toolTip {
-        position: fixed;
-        right: 0;
-        top: 550px;
-        z-index: 999;

        .base {
          display: inline-block;
--- a/hb_client/src/components/customForm/index.vue
+++ b/hb_client/src/components/customForm/index.vue
@ -687,9 +687,15 @@
        that.field = []; //检查项目
        let submit = isSubmit=='1'?false:true;
        that.formData.forEach((item) => {
+          let field_value = 0;
+          if(item.field_type==='int'){
+            field_value = parseInt(that.checkForm[item.field_key])
+          }else if(item.field_type==='float'){
+            field_value = parseFloat(that.checkForm[item.field_key])
+          }
          that.field.push({
            id: item.id,
-            field_value: that.checkForm[item.field_key],
+            field_value: field_value,
            is_testok: item.is_testok,//单项检查结果
            is_hidden: item.is_hidden
          });
--- a/hb_client/src/components/customForm/review.vue
+++ b/hb_client/src/components/customForm/review.vue
@ -788,9 +788,15 @@
        that.field = []; //检查项目
        let submit = isSubmit=='1'?false:true;
        that.formData.forEach((item) => {
+          let field_value = 0;
+          if(item.field_type==='int'){
+            field_value = parseInt(that.checkForm[item.field_key])
+          }else if(item.field_type==='float'){
+            field_value = parseFloat(that.checkForm[item.field_key])
+          }
          that.field.push({
            id: item.id,
-            field_value: that.checkForm[item.field_key],
+            field_value: field_value,
            is_testok: item.is_testok,//单项检查结果
            is_hidden: item.is_hidden
          });
--- a/hb_client/src/views/pm/management.vue
+++ b/hb_client/src/views/pm/management.vue
@ -34,8 +34,7 @@
        fit
        stripe
        style="width: 100%"
-        height="100"
-        v-el-height-adaptive-table="{ bottomOffset: 40 }"
+        height="300"
      >
        <el-table-column type="index" width="50" />

@ -103,10 +102,14 @@
        :limit.sync="listQuery.page_size"
        @pagination="getplanList"
      />
-       <gantt
-          v-if="ganttShow"
-          :proList="proList"
-        ></gantt>
+    </el-card>
+    <el-card class="box-card">
+      <div style="height: 40px;line-height: 40px;background: #F5F7FA;padding-left: 20px;">甘特图</div>
+      <gantt
+        style="position: relative"
+        v-if="proList.length>0"
+        :proList="proList"
+      ></gantt>
    </el-card>
  </div>
 </template>
@ -138,6 +141,7 @@ export default {
    
      listLoading: true,
      proList: [],
+
    };
  },
  computed: {},
@ -183,9 +187,12 @@ export default {
              obj.planTime = [startTime, endTime];
              obj.per = item.count;
              obj.type = 1;
+              obj.productName = item.product_.name;
+              obj.productNum = item.product_.specification;
              obj.isShow = true;
              arr.push(obj);
            }
+            debugger;
            that.proList = arr;
          });
        }
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@ -87,7 +87,7 @@
        @pagination="getplanList"
      />
    </el-card>
-    <el-tabs type="border-card" v-model="activeName" @tab-click="activeNameClick">
+    <el-tabs class="overFlowShow" type="border-card" v-model="activeName" @tab-click="activeNameClick">
      <el-tab-pane label="订单排产" name="订单排产">
        <el-table
          :data="orderList.results"
@ -292,6 +292,8 @@
                obj.planTime = [startTime, endTime];
                obj.per = item.count;
                obj.type = 1;
+                obj.productName = item.product_.name;
+                obj.productNum = item.product_.specification;
                obj.isShow = true;
                arr.push(obj);
              }
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@ -186,7 +186,7 @@
                      v-if="item.field_type === 'string'"
                      :label="item.field_name"
                    >
-                      <el-input placeholder="请输入" v-model="item.sort" />
+                      <el-input v-model="item.field_value" placeholder="请输入"/>
                    </el-form-item>
                    <el-form-item
                      v-else-if="item.field_type === 'int'"
@ -195,7 +195,7 @@
                      <el-input
                        type="number"
                        placeholder="请输入"
-                        v-model="item.sort"
+                        v-model="item.field_value"
                      />
                    </el-form-item>
                    <el-form-item
@ -205,7 +205,7 @@
                      <el-input
                        type="number"
                        placeholder="请输入"
-                        v-model="item.sort"
+                        v-model="item.field_value"
                      />
                    </el-form-item>
                    <el-form-item
@ -213,7 +213,7 @@
                      :label="item.field_name"
                    >
                      <el-date-picker
-                        v-model="item.create_time"
+                        v-model="item.field_value"
                        type="date"
                        placeholder="选择日期"
                        value-format="yyyy-MM-dd"
@ -226,7 +226,7 @@
                      :label="item.field_name"
                    >
                      <el-date-picker
-                        v-model="item.create_time"
+                        v-model="item.field_value"
                        type="datetime"
                        placeholder="选择日期"
                        value-format="yyyy-MM-dd HH:mm:ss"
@ -240,7 +240,7 @@
                    >
                      <el-select
                        style="width: 100%"
-                        v-model="item.sort"
+                        v-model="item.field_value"
                        placeholder="请选择"
                      >
                        <el-option
@ -258,7 +258,7 @@
                    >
                      <el-select
                        style="width: 100%"
-                        v-model="optio"
+                        v-model="item.field_value"
                        multiple
                        placeholder="请选择"
                      >
@ -603,6 +603,7 @@ export default {
      },
      fieldList: {
        count: 0,
+        name:'',
      },
      listQueryfield: {
        page: 1,
@ -796,7 +797,9 @@ export default {
      this.formID = scope.row.id;
      recordInit( this.formID).then((response) => {
        if (response.data) {
+          debugger;
          this.fieldList = response.data;
+          this.fieldList.name = response.data.form_.name;
        }
      });
      this.dialogVisibleForm = true;
@ -818,16 +821,21 @@ export default {
      let _this = this;
      _this.record_data = []; //检查项目
      this.fieldList.record_data.forEach((item) => {
+        if(item.field_type==='int'){
+         item.field_value = parseInt(item.field_value)
+        }else if(item.field_type==='float'){
+          item.field_value = parseFloat(item.field_value)
+        }
        _this.record_data.push({
          id: item.id,
-          field_value: item.field_value,
+          field_value:item.field_value,
        });
      });
      this.record.record_data = _this.record_data;
      createRecord(this.formID, this.record).then((res) => {
        if (res.code >= 200) {
          this.getrecordLists();
-          this.$message.success("创建成功！");
+          this.$message.success("提交成功！");

          this.dialogVisibleForm = false;
        }