no message

mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue

@@ -95,7 +95,17 @@
           size="mini"
           @click="confirmRepair"
         >
-          班组验收
+          验收通过
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-position"
+          size="mini"
+          @click="confirmRepair2"
+        >
+          验收不通过
         </el-button>
       </crudOperation>
       <!--表格渲染-->
@@ -259,7 +269,23 @@ export default {
           return this.crud.notify('只能对结束状态的单据确认:' + now.repair_code, CRUD.NOTIFICATION_TYPE.INFO)
         }
       }
-      crudDevicerepairmst.confirmRepair({ rows: _selectData }).then(res => {
+      crudDevicerepairmst.confirmRepair({ invstatus: '07', rows: _selectData }).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    confirmRepair2() {
+      const _selectData = this.$refs.table.selection
+      if (_selectData.length === 0) {
+        return this.crud.notify('请选择需要操作的记录！', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      for (let i = 0; i < _selectData.length; i++) {
+        const now = _selectData[i]
+        if (now.invstatus !== '06') {
+          return this.crud.notify('只能对结束状态的单据操作:' + now.repair_code, CRUD.NOTIFICATION_TYPE.INFO)
+        }
+      }
+      crudDevicerepairmst.confirmRepair({ invstatus: '03', rows: _selectData }).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })

mes/qd/src/views/wms/statistics/materPlan/index.vue

@@ -65,8 +65,8 @@
       >
         <el-table-column type="index" label="序号" width="100" align="center" fixed/>
         <template v-for="(col,index) in cols2">
-          <el-table-column v-if="!col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
-          <el-table-column v-if="col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip fixed/>
+          <el-table-column v-if="!col.option" :prop="col.prop" :label="col.label" width="120px" />
+          <el-table-column v-if="col.option" :prop="col.prop" :label="col.label" width="120px" fixed/>
         </template>
       </el-table>
       <!--分页组件-->