修改旋转逻辑，增加辅助旋转功能

于杰

88 分钟以前 69a25cd577d5639f2869bcf80f498b373e80137e

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

@@ -14,6 +14,7 @@
import {VXETable} from "vxe-table";
import  useUserInfoStore from '@/stores/userInfo'
import {useI18n} from "vue-i18n";
import { computed } from 'vue'
import UpdateOrderCraft from "@/components/sd/order/UpdateOrderCraft.vue";
import {filterChanged} from "@/hook";
let productGlassTypeStore = useProductGlassTypeStore()
@@ -78,20 +79,40 @@
const saveCraft = () => {
  //rowIndex.value.process = craftObj.newCraft.join('->')
 let orderProcess= craftObj.newCraft.join('->')
  request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
    if (res.code == 200 && res.data === true) {
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({
        path: '/main/processCard/SelectDetailProcessCard',
        query: {processId: processId,random: Math.random()}
      })
    } else {
  //获取差异工序
  const diffCraft = computed(() => {
    return [
      ...craftObj.oldCraft.filter(item => !craftObj.newCraft.includes(item)), //删除
      ...craftObj.newCraft.filter(item => !craftObj.oldCraft.includes(item))//增加
    ]
  })
  if (diffCraft.value == '') {//无变化不执行后续
    return
  }
  //获取最新报工工序的顺序
request.post(`/processCard/getNewProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${diffCraft.value}`).then((res) => {
    if (res.code == 200 ) {
      if (res.data){
        request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
          if (res.code == 200 && res.data === true) {
            ElMessage.success(t('basicData.msg.saveSuccess'))
            router.push({
              path: '/main/processCard/SelectDetailProcessCard',
              query: {processId: processId,random: Math.random()}
            })
          } else {

      ElMessage.warning('保存失败，检查是否报工')
            ElMessage.warning(t('processCard.updateProcessMsg'))

          }
        })
        craftVisible.value= false
      }else {
        ElMessage.warning(t('processCard.updateProcessMsg'))
      }
    }
  })
  craftVisible.value= false

}


@@ -116,6 +137,20 @@
  rowIndex.value = row
}

const updateTerminationNo = (row) => {
  let processId = row.process_id
  let orderNumber = row.order_number
  request.post(`/processCard/updateTerminationNo/${processId}/${orderNumber}`).then((res) => {
    if (res.code == 200 && res.data === true) {
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({
        path: '/main/processCard/SelectDetailProcessCard',
        query: {processId: processId,random: Math.random()}
      })
    }
  })
}

const updateTermination = (row) => {
  let processId = row.process_id
  let orderNumber = row.order_number
@@ -129,18 +164,14 @@
      completed.value=res.data.data
      completedOk.value = row.quantity*1 - completed.value*1
      //弹窗
      ElMessageBox.prompt( '最大已完工数量：'+completed.value, {
      ElMessageBox.prompt( t('processCard.maxCompleted'), {
        confirmButtonText: t('basicData.save'),
        cancelButtonText: t('basicData.cancelButtonText'),
        inputPattern:/^(\d+|)$/,
        inputErrorMessage: t('processCard.terminationMsg'),
        inputValue:row.quantity
      }).then(({ value }) => {
        console.log(completedOk.value,  value)
        if (completedOk.value <  value  ) {
          ElMessage.warning(t('processCard.terminationMsg'))
          return
        }

        request.post(`/processCard/updateTermination/${processId}/${orderNumber}/${value}`).then((res) => {
          if (res.code == 200 && res.data === true) {
            ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -237,13 +268,14 @@
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {title: t('basicData.operate'), width: 120, slots: { default: 'button_slot' },fixed:"left",},
    {title: t('basicData.operate'), width: 200, slots: { default: 'button_slot' },fixed:"left",},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
    {field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 110 },
    {field: 'process_id', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
    {field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
    {field: 'quantity', title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
    {field: 'termination_quantity', title: t('processCard.terminationQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
    {field: 'child_width', title: t('order.width'),width: 80 },
    {field: 'child_height', title: t('order.height'),width: 80 },
    {field: 'area', title: t('order.area') ,showOverflow:"ellipsis",width: 70},
@@ -315,7 +347,7 @@

          })
          ElMessageBox.confirm(
              "是否合并？",
              t('processCard.msg.msg6'),
              {
                confirmButtonText: t('basicData.confirmButtonText'),
                cancelButtonText: t('basicData.cancelButtonText'),
@@ -381,7 +413,8 @@
      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="updateCraft(row)" link type="primary" size="small">{{$t('craft.updateCraft')}}</el-button>
        <el-button @click="updateTermination(row)" link type="primary" size="small">终止</el-button>
        <el-button @click="updateTermination(row)" link type="primary" size="small">{{$t('processCard.termination')}}</el-button>
        <el-button @click="updateTerminationNo(row)" link type="primary" size="small">{{$t('processCard.terminationNo')}}</el-button>
      </template>

      <template #num1_filter="{ column, $panel }">