Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-12 40c71665c39423120973349edfd76d07ab27a15e

 north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue

@@ -239,7 +239,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'productionScheduling',
  showFooter: true,//显示脚
  printConfig: {},
@@ -258,7 +258,7 @@
    storage: true
  },
  editConfig: {
    trigger: 'click',
    trigger: 'dblclick',
    mode: 'row',
    showStatus: true
  },
@@ -308,6 +308,15 @@
      editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
      title: t('processCard.planEndTime')
    },
    {
      field: 'schedulingQuantity',
      width: 120,
      editRender: {name: 'input', attrs: {placeholder: ''}},
      title: t('processCard.productionSchedulingQuantity'),
      sortable: true
    },
    {field: 'notes', title: t('processCard.notes'), editRender: {name: 'input', attrs: {placeholder: ''}}, width: 120},

    // {field: '排产编号', title: '排产编号',  width: 120 },
    {
      field: 'orderGlassDetail.orderId',
@@ -356,13 +365,7 @@
    },
    {field: 'orderDetail.quantity', title: t('processCard.orderQuantity'), width: 90},
    {field: 'orderGlassDetail.area', title: t('processCard.orderArea'), width: 90},
    {
      field: 'schedulingQuantity',
      width: 120,
      editRender: {name: 'input', attrs: {placeholder: ''}},
      title: t('processCard.productionSchedulingQuantity'),
      sortable: true
    },

    {field: 'pendingProductionQuantity', title: t('processCard.quantityToScheduled'), width: 100},
    {field: 'pendingProductionArea', title: t('processCard.areaToScheduled'), width: 100},
    {field: 'productionScheduledQuantity', title: t('processCard.plannedProductionQuantity'), width: 100},
@@ -371,7 +374,6 @@
    {field: 'reviewer', title: t('processCard.reviewed'), width: 80},
    {field: 'orderDetail.productName', title: t('order.product'), width: 140},
    {field: 'orderDetail.shape', title: t('order.shape'), width: 80},
    {field: 'notes', title: t('processCard.notes'), editRender: {name: 'input', attrs: {placeholder: ''}}, width: 120},
    {field: 'schedulingId', title: t('processCard.schedulingId'), width: 120},
  ],//表头按钮

@@ -476,22 +478,29 @@
              ElMessage.warning("请勾选排产数据")
              return;
            }
            const type = await VXETable.modal.confirm('您确定要删除该数据?')
            if (type === 'confirm') {
              let schedulingData = ref({
                scheduling: selectRecords,
              })

              request.post("/productionScheduling/deleteScheduling", schedulingData.value).then((res) => {
                if (res.code == 200) {
                  ElMessage.success("删除成功")
                  location.reload();
                } else {
                  ElMessage.warning(res.msg)

                }
              })
            }
            selectRecords.forEach(item => {
              if(item.reviewStatus=="已审核"){
                ElMessage.warning("不能删除已审核数据")
                return;
              }
            });
            alert(1111)
            // const type = await VXETable.modal.confirm('您确定要删除该数据?')
            // if (type === 'confirm') {
            //   let schedulingData = ref({
            //     scheduling: selectRecords,
            //   })
            //
            //   request.post("/productionScheduling/deleteScheduling", schedulingData.value).then((res) => {
            //     if (res.code == 200) {
            //       ElMessage.success("删除成功")
            //       location.reload();
            //     } else {
            //       ElMessage.warning(res.msg)
            //
            //     }
            //   })
            // }
          }
          return;
        }
@@ -582,17 +591,28 @@
  const table = $grid.getTableData().fullData
  const selectRecords = $grid.getCheckboxRecords()
  let selectState = stateValue.value
  table.forEach((selectRecords) => {
    if (selectRecords.scheduling_quantity > selectRecords.pendingProductionQuantity && selectState == 1) {
  selectRecords.forEach((selectRecords) => {
    console.log(selectRecords)
    if (selectRecords.schedulingQuantity > selectRecords.pendingProductionQuantity) {
      ElMessage.warning("排产数量不能大于待排产数量")
      //禁用保存按钮
      //gridOptions.toolbarConfig.buttons[2].disabled = true
    }


  })
}
const checkBoxConfig = {
  checkMethod: ({ row }) => {
    console.log(row)
    if (row['reviewStatus']==="已审核"){
      return row.disable
    }else{
      return !row.disable
    }

  },
  reserve:true

}

</script>

@@ -648,6 +668,7 @@
        v-on="gridEvents"
        @filter-change="filterChanged"
        @checkbox-change="determineNum"
        :checkbox-config="checkBoxConfig"
    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->