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

src/api/produceOrder/index.js

@@ -93,7 +93,6 @@ export async function reportCount (params) {
 // 详情页-tab列表
 export async function reportPage (data) {
   const res = await request.post('/mes/workreport/page', data);
-  console.log('res.data.data',res.data.data)
   if (res.data.code == 0) {
     return res.data.data;
   }

src/views/produceOrder/index.vue

@@ -184,6 +184,12 @@
             align: 'center',
             minWidth: 110
           },
+		 {
+			  slot: 'originalCode',
+			  label: '原始工单号',
+			  align: 'center',
+			  minWidth: 110
+		  },
           {
             prop: 'productionPlanCode',
             label: '计划编号',
@@ -192,7 +198,13 @@
           {
             prop: 'planType',
             label: '计划类型',
-            align: 'center'
+            align: 'center',
+			formatter: (row) => {
+			  const obj = this.planType.find(
+			    (i) => i.value == row.planType
+			  );
+			  return obj && obj.label;
+			}
           },
           {
             prop: 'produceVersionName',
@@ -334,7 +346,7 @@
       // 完结与批量完结
       toEnd (row) {
         if (row) {
-          this.$confirm(`是否要完结工单 <span style="color: red;">【${row.code}】</span>？`, '提醒', {
+          this.$confirm(`是否要完结工单【${row.code}】？`, '提醒', {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
             type: 'warning'
@@ -354,11 +366,19 @@
           this.selection.map((item) => {
             ids.push(item.id);
           });
-          this.$confirm(`是否要完结${this.selection.length}条工单？`, '提醒', {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
+		  const h = this.$createElement;
+           this.$msgbox({
+			  title: '提醒',
+			  message: h('p', null, [
+				h('span', null, '是否要完结 '),
+				h('span', { style: 'color: #70B603' }, `${this.selection.length}`),
+				h('span', null, ' 条工单?'),
+			  ]),
+			  showCancelButton: true,
+			  confirmButtonText: '确认',
+			  cancelButtonText: '取消',
+			  type: 'warning'
+			})
             .then(() => {
               batchCompletion(ids).then((res) => {
                 this.$message.success('成功');