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

hb_client/.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
+VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
-VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
+#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
 
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

hb_client/src/views/dashboard/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <el-card style="margin-bottom: 5px">
+    <el-card class="dashboardTopCard">
       <div class="cards">
         <div class="cardFirstText">本月：2</div>
         <div class="cardSecondText">20</div>
@@ -27,24 +27,27 @@
         <div>累计不合格产品数</div>
       </div>
     </el-card>
-    <el-row :gutter="5" style="margin-bottom: 5px">
+    <el-row class="dashboardSubRow" :gutter="5">
       <el-col :span="12">
         <el-card>
-          <div style="display: flex">
+          <div class="dashboardCardHand">
-            <div style="height: 35px; line-height:35px;font-size: 24px;font-weight: bold;vertical-align: middle">任务排期</div>
+            <div class="dashboardCardTitle">任务排期</div>
-            <el-date-picker
+            <div class="dashboardCardFilter">
-              v-model="date"
+              <el-date-picker
-              type="month"
+                v-model="tableDate"
-              placeholder="查询日期"
+                type="month"
-              range-separator="至"
+                placeholder="查询日期"
-              format="yyyy 年 MM 月"
+                range-separator="至"
-              value-format="yyyy-MM"
+                format="yyyy 年 MM 月"
-            >
+                value-format="yyyy-MM"
-            </el-date-picker>
+                @change="searchTimeChange('1')"
-            <div style="display: flex;border: 1px solid #aaaaaa;border-radius: 6px;height: 35px; line-height:35px;">
+              >
-              <div style=" cursor: pointer;width: 60px;text-align:center;border-right: 1px solid #aaaaaa;">周</div>
+              </el-date-picker>
-              <div style="width: 60px;text-align:center;border-right: 1px solid #aaaaaa;">月</div>
+              <div class="convenientWrap">
-              <div style="width: 60px;text-align:center;">三个月</div>
+                <div class="convenientBtn" :class="{activeIndex:tableIndex==='1'}" @click="convenientClick('1','week')">本周</div>
+                <div class="convenientBtn" :class="{activeIndex:tableIndex==='2'}" @click="convenientClick('1','month')">本月</div>
+                <div class="convenientBtn" :class="{activeIndex:tableIndex==='3'}" @click="convenientClick('1','quarter')">三个月</div>
+              </div>
             </div>
           </div>
           <el-table
@@ -71,38 +74,46 @@
       </el-col>
       <el-col :span="12">
         <el-card>
-          <div style="display: flex">
+          <div class="dashboardCardHand">
-            <div style="height: 35px; line-height:35px;font-size: 24px;font-weight: bold;vertical-align: middle">成品率</div>
+            <div class="dashboardCardTitle">成品率</div>
-            <el-date-picker
+            <div class="dashboardCardFilter">
-              v-model="date"
+              <el-date-picker
-              type="month"
+                v-model="chartDate"
-              placeholder="查询日期"
+                type="month"
-              range-separator="至"
+                placeholder="查询日期"
-              format="yyyy 年 MM 月"
+                range-separator="至"
-              value-format="yyyy-MM"
+                format="yyyy 年 MM 月"
-            >
+                value-format="yyyy-MM"
-            </el-date-picker>
+                @change="searchTimeChange('2')"
-            <div style="display: flex;border: 1px solid #aaaaaa;border-radius: 6px;height: 35px; line-height:35px;">
+              >
-              <div style=" cursor: pointer;width: 60px;text-align:center;border-right: 1px solid #aaaaaa;">周</div>
+              </el-date-picker>
-              <div style="width: 60px;text-align:center;border-right: 1px solid #aaaaaa;">月</div>
+              <div class="convenientWrap">
-              <div style="width: 60px;text-align:center;">三个月</div>
+                <div class="convenientBtn" :class="{activeIndex:chartIndex==='1'}" @click="convenientClick('2','week')">本周</div>
+                <div class="convenientBtn" :class="{activeIndex:chartIndex==='2'}" @click="convenientClick('2','month')">本月</div>
+                <div class="convenientBtn" :class="{activeIndex:chartIndex==='3'}" @click="convenientClick('2','quarter')">三个月</div>
+              </div>
             </div>
           </div>
           <div id="chartColumn" style="width:100%; height:300px;"></div>
         </el-card>
       </el-col>
     </el-row>
-    <el-row :gutter="5" style="margin-bottom: 5px">
+    <el-row class="dashboardSubRow" :gutter="5">
       <el-col :span="12">
         <el-card>
-          <div style="display: flex">
+          <div class="dashboardCardHand">
-            <div style="height: 35px; line-height:35px;font-size: 24px;font-weight: bold;vertical-align: middle">库存列表</div>
+            <div class="dashboardCardTitle">库存列表</div>
             <div class="block">
               <el-pagination
-                :current-page.sync="currentPage"
+                :current-page.sync="stockPage"
-                :page-size="100"
+                :page-size="stockPageSize"
                 layout="prev, pager, next, jumper"
-                :total="1000">
+                :total="stockTotal"
+                pager-count="3"
+                :page-sizes="[10, 20, 30, 40]"
+                @size-change="handleStockSizeChange"
+                @current-change="handleStockCurrentChange"
+              >
               </el-pagination>
             </div>
           </div>
@@ -138,23 +149,52 @@
       </el-col>
       <el-col :span="12">
         <el-card style="height: 350px">
-          <div style="display: flex">
+          <div class="dashboardCardHand">
-            <div style="height: 35px; line-height:35px;font-size: 24px;font-weight: bold;vertical-align: middle">提醒</div>
+            <div class="dashboardCardTitle">提醒</div>
             <div class="block">
               <el-pagination
-                :current-page.sync="currentPage"
+                :current-page.sync="remindPage"
-                :page-size="100"
+                :page-size="remindPageSize"
                 layout="prev, pager, next, jumper"
-                :total="1000">
+                :total="remindTotal"
+                @size-change="handleRemindSizeChange"
+                @current-change="handleRemindCurrentChange"
+              >
               </el-pagination>
             </div>
           </div>
-          <el-badge :value="count.total_count" class="item" @click.native="gotoTicketPage">
+          <div class="lists">
+            <ul style="padding-right: 40px">
+              <li style="height: 50px;line-height: 50px;font-size: 20px">
+                <div style="display: flex;justify-content: space-between">
+                  <span>玻璃低于安全库存</span><span>2021-12-30</span>
+                </div>
+              </li>
+              <li style="height: 50px;line-height: 50px;font-size: 20px">
+                <div style="display: flex;justify-content: space-between">
+                  <span>某某批货临近交货日期</span><span>2021-12-20</span>
+                </div>
+              </li>
+              <li style="height: 50px;line-height: 50px;font-size: 20px">
+                <div style="display: flex;justify-content: space-between">
+                  <span>玻璃低于安全库存</span><span>2021-11-30</span>
+                </div>
+              </li>
+              <li style="height: 50px;line-height: 50px;font-size: 20px">
+                <div style="display: flex;justify-content: space-between">
+                  <span>某某批货临近交货日期</span><span>2021-11-20</span>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <!--<el-badge :value="count.total_count" class="item" @click.native="gotoTicketPage">
             <el-icon class="el-icon-s-management" style="font-size: 70px;color: #d29898"></el-icon>
           </el-badge>
           <div></div>
           <div class="dashboard-text">name: {{ name }}</div>
-          <div class="dashboard-text">perms: <span v-for="perm in perms" :key="perm">{{ perm }}</span></div>
+          <div class="dashboard-text">perms:
+            <span v-for="perm in perms" :key="perm">{{ perm }}</span>
+          </div>-->
         </el-card>
       </el-col>
     </el-row>
@@ -169,14 +209,23 @@ export default {
   data() {
     return {
       chartColumn: null,
-      currentPage:1,
+      stockPage:1,
-      total_count:1,
+      stockPageSize:10,
-      date:'2021-12',
+      stockTotal:100,
+      remindPage:2,
+      remindPageSize:20,
+      remindTotal:100,
+      tableIndex:null,
+      chartIndex:null,
+      tableDate:'2021-12',
+      chartDate:'2021-12',
+
       list:[
         {id:1,name:'HIehd9',card:'3337',sco:'REF-32'},
         {id:1,name:'HIehd9',card:'3337',sco:'REF-32'},
         {id:1,name:'HIehd9',card:'3337',sco:'REF-32'}
       ],
+      seriesData:[80,60,60, 70, 76, 80, 90, 70],
     }
   },
   computed: {
@@ -195,34 +244,28 @@ export default {
         this.$router.push({name:'ticket',params:{}})
       }
     },
+    //图标渲染
     drawChart() {
       this.chartColumn = echarts.init(document.getElementById('chartColumn'));
       this.chartColumn.setOption({
         // title: { text: '成品率' },
-        /*tooltip: {
-          trigger:'axis',
-          aXisPointer:{
-            type:'cross'
-          },
-          formatter(params){
-            for(let x in params){
-              return params[x].name +":"+params[x].data+"%";
-            }
-          },
-        },*/
         grid: {
-          top: '3%',
+          top: '10%',
           left: '3%',
-          right: '4%',
+          right: '5%',
           bottom: '1%',
           containLabel: true
         },
         tooltip: {
           trigger: 'item',
+          /* formatter(params){
+            for(let x in params){
+              return params[x].name +":"+params[x].data+"%";
+            }
+          }*/
           formatter: function (params) {
-           var color = params.color;//图例颜色
+            let color = params.color;//图例颜色
-           // var color = "red";//图例颜色
+            let htmlStr ='<div>';
-            var htmlStr ='<div>';
             htmlStr += params.name + '<br/>';
             htmlStr += '<span style="height:10px;width:10px;font-size:12px;border-radius:5px;margin-right:5px;font-family:Consolas;display:inline-block;background:'+color+';"></span>';
             htmlStr += params.seriesName + '：'+params.value + '%';
@@ -231,14 +274,37 @@ export default {
           }
         },
         xAxis: {
+          name:'工序',
+          axisTick: {
+            show: false
+          },
+          splitLine: {
+            show: false, //去掉X轴分割线
+          },
           data: ["冷加工", "热弯", "钢化", "镀膜", "夹层", "包边", "装框", "成品"]
         },
-        yAxis: {},
+        yAxis: {
+          axisLine:{
+            show:true,//y轴线
+          },
+          axisTick: {
+            show: false//Y轴刻度线
+          },
+          axisLabel:{
+            color:'#333333'//Y轴文本颜色
+          },
+          splitLine: {
+            show: true, //Y轴分割线
+            lineStyle:{
+              color:'#dddddd'//Y轴分割线颜色
+            }
+          },
+        },
         series: [{
           name: '成品率',
           type: 'bar',
           barWidth: 40,
-          data: [80,60,60, 70, 76, 80, 90, 70],
+          data: this.seriesData,
           label: {
             show: true, //开启显示
             position: 'top', //在上方显示
@@ -251,19 +317,77 @@ export default {
           itemStyle: {
             normal: {
               color: function(params) {
-                var colorList = [
+                let colorList = [
                   '#5e7e54','#e44f2f','#81b6b2','#eba422',
                   '#1bcde4','#b61b08','#84eb84','#d8d417'
                 ];
                 return colorList[params.dataIndex]
               },
-
             }
           },
         }]
       });
     },
+    //便捷查询按钮
+    convenientClick(index,type){
+      let startTime = '',endTime = '',url='',activeIndex = '1',obj = new Object();
+      let dat = new Date();
+      let currentTime = dat.getTime();
+      let currentYear = dat.getFullYear();
+      let currentMonth =  dat.getMonth() + 1;
+      let currentDay =  dat.getDate();
+      endTime = currentYear+'-'+currentMonth+''+currentDay;
+      if(type==='week'){
+        activeIndex = '1';
+        let time = currentTime-6*24*60*60*1000;
+        let start = new Date(time);
+        startTime = start.getFullYear()+'-'+(start.getMonth()+1)+'-'+start.getDate();
+      }else if(type==='month'){
+        activeIndex = '2';
+        let time = currentTime-30*24*60*60*1000;
+        let start = new Date(time);
+        startTime = start.getFullYear()+'-'+(start.getMonth()+1)+'-'+start.getDate();
+      }else if(type==='quarter'){
+        activeIndex = '3';
+        let time = currentTime-120*24*60*60*1000;
+        let start = new Date(time);
+        startTime = start.getFullYear()+'-'+(start.getMonth()+1)+'-'+start.getDate();
+      }
+      obj.startTime = startTime;
+      obj.endTime = endTime;
+      if(index==='1'){
+        this.tableDate = null;
+        this.tableIndex = activeIndex;
+      }else{
+        this.chartDate = null;
+        this.chartIndex = activeIndex;
+      }
+      //根据时间和类型获取数据
+    },
+    //选择月份
+    searchTimeChange(index){
+      if(index==='1'){
+        this.tableIndex = null;
+      }else{
+        this.chartIndex = null;
+      }
+    },
+    handleStockSizeChange(val){
+      this.stockPageSize = val;
+      this.stockPage = 1;
+    },
+    handleStockCurrentChange(val){
+      console.log(`当前页: ${val}`);
+    },
+    handleRemindSizeChange(val){
+      this.remindPageSize = val;
+      this.remindPage = 1;
+    },
+    handleRemindCurrentChange(val){
+      console.log(`当前页: ${val}`);
+    },
   },
+
   mounted () {
     this.drawChart()
   },
@@ -274,34 +398,79 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.dashboard {
+.dashboard-container {
-  &-container {
+  margin: 5px 6px;
-    margin: 5px 6px;
-  }
-  &-text {
-    font-size: 30px;
-    line-height: 46px;
-  }
 }
-.cards{
+.dashboard-text {
-  width: 240px;
+  font-size: 30px;
-  color: #ffffff;
+  line-height: 46px;
-  background: #abccec;
+}
-  text-align: center;
+.dashboardTopCard{
-  border-radius: 4px;
+  margin-bottom: 5px;
-  padding: 10px;
+  .cards{
-  line-height: 30px;
+    width: 240px;
-  float: left;
+    color: #ffffff;
-  margin: 15px;
+    background: #abccec;
-  .cardFirstText{
+    text-align: center;
-    text-align: left;
+    border-radius: 4px;
-    padding-left: 20px;
+    padding: 10px;
-  }
+    line-height: 30px;
-  .cardSecondText{
+    float: left;
-    font-size: 30px;
+    margin: 15px;
+    .cardFirstText{
+      text-align: left;
+      padding-left: 20px;
+    }
+    .cardSecondText{
+      font-size: 30px;
+    }
   }
 }
 .cards:hover{
   box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
 }
+.dashboardSubRow{
+  margin-bottom: 5px;
+  .dashboardCardHand{
+    display: flex;
+    justify-content: space-between;
+    .dashboardCardTitle{
+      height: 35px;
+      line-height:35px;
+      font-size: 24px;
+      font-weight: bold;
+      vertical-align: middle;
+    }
+    .dashboardCardFilter{
+      display: flex;
+      .convenientWrap{
+        display: flex;
+        border: 1px solid #DCDFE6;
+        border-radius: 6px;
+        height: 35px;
+        line-height:35px;
+        margin-left: 10px;
+        .convenientBtn{
+          cursor: pointer;
+          width: 60px;
+          text-align:center;
+          border-right: 1px solid #DCDFE6;
+        }
+        .convenientBtn:last-child{
+          border-right: 0;
+          border-radius: 0 6px 6px 0;
+        }
+        .convenientBtn:first-child{
+          border-radius: 6px 0 0 6px;
+        }
+        .activeIndex{
+          color: #ffffff;
+          background: #409EFF;
+        }
+      }
+    }
+
+  }
+
+}
 </style>

hb_server/apps/mtm/filters.py

@@ -9,7 +9,7 @@ class TechDocFilterset(filters.FilterSet):
     # operation = filters.CharFilter(field_name="subproduction__subplan_subprod__ow_subplan__operation")
     class Meta:
         model = TechDoc
-        fields = ['subproduction', 'operation']
+        fields = ['subproduction', 'operation', 'enabled']
 
     def filter_operation(self, queryset, name, value):
         return queryset.filter(subproduction__subplan_subprod__ow_subplan__operation=value).distinct()

hb_server/apps/wpm/signals.py

@@ -46,10 +46,10 @@ def handleTicket(sender, instance, created, **kwargs):
             wp = wt.wproduct
             decision = WProduct.NG_BACK_WORK
             
-            if 'decision_1' in ticket_data and ticket_data['decision_1']:
+            if 'decision_2' in ticket_data and ticket_data['decision_2']:
-                decision = ticket_data['decision_1']
-            elif 'decision_2' in ticket_data and ticket_data['decision_2']:
                 decision = ticket_data['decision_2']
+            elif 'decision_1' in ticket_data and ticket_data['decision_1']:
+                decision = ticket_data['decision_1']
 
 
             wp.ng_sign = decision