Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dengfei

src/api/InTheSystem/index.js

@@ -29,4 +29,13 @@ export async function detailPage(data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
+}
+
+// 工序列表
+export async function getAllProduceTaskByUsing(params) {
+  const res = await request.get(`/main/producerouting/getAllProduceTaskByUsing`, { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }

src/components/common/seekPage.vue

@@ -175,7 +175,7 @@
             return {
               ...base,
               type: item.dateType || 'daterange',
-              'value-format': 'yyyy-MM-dd HH:mm:ss',
+              'value-format': item.valueFormat || 'yyyy-MM-dd HH:mm:ss',
               'range-separator': '至',
               'start-placeholder': '开始日期',
               'end-placeholder': '结束日期'

src/views/batchRecord/components/list.vue

@@ -386,7 +386,8 @@
           this.$refs.table.reload({
             page: 1,
             where,
-            reportWorkType: this.reportWorkType
+            reportWorkType: this.reportWorkType,
+            recordOrder: [1,2,3].includes(this.reportWorkType) ? 1 : ''
           });
         });
       },
@@ -397,7 +398,8 @@
           ...order,
           pageNum: page,
           size: limit,
-          reportWorkType: this.reportWorkType
+          reportWorkType: this.reportWorkType,
+          recordOrder: [1,2,3].includes(this.reportWorkType) ? 1 : ''
         });
       },
       // 打开编辑新增

src/views/batchRecord/components/tables/wmsOutInt.vue

@@ -151,11 +151,12 @@
             value: 'time',
             type: 'date',
             dateType: 'daterange',
+            valueFormat: 'yyyy-MM-dd',
             placeholder: '请输入'
           },
           {
             label: '入库单号',
-            value: 'sourceBizNo',
+            value: 'bizNo',
             type: 'input',
             placeholder: '请输入'
           }

src/views/batchRecord/components/tables/workOrderTable.vue

@@ -33,6 +33,7 @@
   import { batchRecordPage } from '@/api/workOrderList';
   import detailsPop from '@/views/produceOrder/components/details/index.vue';
   import { getById } from '@/api/produceOrder/index';
+  import { getAllProduceTaskByUsing } from '@/api/InTheSystem/index';
 
   export default {
     mixins: [dictMixins, tableColumnsMixin],
@@ -122,7 +123,34 @@
             fixed: 'right'
           }
         ],
-        cacheKeyUrl: 'mes-922194-work-order-table'
+        cacheKeyUrl: 'mes-922194-work-order-table',
+        orderStatus: [
+          {
+            value: 4,
+            label: '待生产'
+          },
+          {
+            value: 5,
+            label: '生产中'
+          },
+          {
+            value: 6,
+            label: '已完成'
+          },
+          {
+            value: 7,
+            label: '已延期'
+          },
+          {
+            value: 9,
+            label: '暂停'
+          },
+          {
+            value: 10,
+            label: '终止'
+          }
+        ],
+        taskList: []
       };
     },
     computed: {
@@ -135,26 +163,44 @@
             placeholder: '请输入'
           },
           {
-            label: '创建时间开始',
-            value: 'createTimeStart',
-            type: 'date',
-            dateType: 'date',
-            placeholder: '请输入',
-            width: '230',
-            labelWidth: 110
+            label: '工序进度：',
+            value: 'taskName',
+            type: 'select',
+            placeholder: '请选择',
+            planList: this.taskList
           },
           {
-            label: '创建时间结束',
-            value: 'createTimeEnd',
-            type: 'date',
-            dateType: 'date',
-            placeholder: '请输入',
-            width: '230',
-            labelWidth: 110
-          }
+            label: '工单状态：',
+            value: 'statuses',
+            type: 'select',
+            multiple: true,
+            placeholder: '请选择',
+            planList: this.orderStatus
+          },
+          // {
+          //   label: '创建时间开始',
+          //   value: 'createTimeStart',
+          //   type: 'date',
+          //   dateType: 'date',
+          //   placeholder: '请输入',
+          //   width: '230',
+          //   labelWidth: 110
+          // },
+          // {
+          //   label: '创建时间结束',
+          //   value: 'createTimeEnd',
+          //   type: 'date',
+          //   dateType: 'date',
+          //   placeholder: '请输入',
+          //   width: '230',
+          //   labelWidth: 110
+          // }
         ];
       }
     },
+    created() {
+      this.getproduceTask();
+    },
     methods: {
       // 刷新表格
       reload(where = {}) {
@@ -182,6 +228,26 @@
         // 查询详情
         const data = await getById(row.id);
         this.$refs.detailsRef.open(data);
+      },
+      // 工序
+      async getproduceTask() {
+        // 查询详情
+        const data = await getAllProduceTaskByUsing({
+          size: 9999
+        });
+        this.taskList = data.map(item => ({
+          value: item.produceTaskName,
+          label: item.produceTaskName
+        }))
+        // -1 入库，-2完结
+        this.taskList.push({
+          value: '入库',
+          label: '入库'
+        },{
+          value: '完结',
+          label: '完结'
+        })
+        console.log('工序', this.taskList);
       }
     }
   };

src/views/home/data.js

@@ -16,6 +16,7 @@ function getDatesInMonth() {
 }
 
 let statusOpt = [
+  { label: '待生产', value: '4' },
   { label: '生产中', value: '5' },
   { label: '已完成', value: '6' },
   { label: '已延期', value: '7' }

src/views/produce/components/prenatalExamination/components/workOrder/details.vue

@@ -397,7 +397,8 @@
     data() {
       return {
         options: {
-          0: '正常',
+          0: '未定义',
+          1: '正常',
           '-1': '缺陷'
         },
         num: 1,

src/views/produce/components/prenatalExamination/index.vue

@@ -230,12 +230,20 @@
         this.dialogVisible = false;
       },
       openMaintenancePlan(item) {
-        console.log('item', item);
-
+        console.log('item~~~', item);
+        // itemType 事项类型
         if (item.itemType == 1) {
+          if((!item.planOrders || item.planOrders.length == 0) && item.executeMethod == 1) {
+            this.$message.error('未生成设备计划');
+            return;
+          }
           // 计划规则 巡点检 设备保养
           this.$refs.planRulesDialogRef.open(item);
         } else if (item.itemType == 2) {
+          if((!item.plans || item.plans.length == 0) && item.executeMethod == 1) {
+            this.$message.error('未生成记录计划');
+            return;
+          }
           this.$refs.releaseRulesDialogRef.open(
             item,
             this.workOrderInfo,