修复bug

yangys

2025-09-10 057ce688e9fe904c1a74b2505531d5afc7acf43e

 src/views/flowmgr/taskassigntemp.vue

@@ -8,32 +8,43 @@
-->
<template>
  <basic-container>
    <avue-form ref="form" :option="attachOption" v-model="attachForm" @submit="formSubmit"></avue-form>
    <avue-form ref="form" :option="attachOption" v-model="attachForm" @submit="formSubmit">
      <template #machineCode="{}">
        <el-tree-select ref="tree" filterable  v-model="attachForm.machineCode"
         node-key="machineCode"
          :data="treeData" :props="defaultProps">
          </el-tree-select>
      </template>
      <template #drawingNo="{}">
        <el-autocomplete   v-model="attachForm.drawingNo"
        :fetch-suggestions="querySearchAsync"
        :trigger-on-focus="false" @select="handleSelect"
          >
        </el-autocomplete>
      </template>
    </avue-form>
  </basic-container>
</template>

<script>
import {
  getQueryString,
} from '@/utils/util';

export default {
  watch: {
    'attachForm.drawingNo': function (val) {
      if(val && this.attachForm.processNo && this.attachForm.processEdition) {
        this.attachForm.title = `${val}-${this.attachForm.processNo}-${this.attachForm.processEdition}-数控程序编制`;
        this.attachForm.title = `${val}-${this.attachForm.processNo}-${this.attachForm.processEdition}-数控程序补充`;
      }
    },
    'attachForm.processNo': function (val) {
      if(val && this.attachForm.drawingNo && this.attachForm.processEdition) {
        //this.attachForm.title = `${val}-${this.attachForm.processNo}-数控程序编制`;
          this.attachForm.title = `${this.attachForm.drawingNo}-${val}-${this.attachForm.processEdition}-数控程序编制`;
          this.attachForm.title = `${this.attachForm.drawingNo}-${val}-${this.attachForm.processEdition}-数控程序补充`;
      }
    },
    'attachForm.processEdition': function (val) {
      if(val && this.attachForm.drawingNo && this.attachForm.processNo ) {
        //this.attachForm.title = `${val}-${this.attachForm.processNo}-数控程序编制`;
          this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo} -${val}-数控程序编制`;
          this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo}-${val}-数控程序补充`;
      }
    },
  },
@@ -42,6 +53,14 @@
    var that = this;
    return {
      form: {},
      treeData: [],
      defaultProps: {
        children: 'children',
        label: 'name',
        disabled: (data) => data.nodeType!=='machine',//仅机床节点可选
        isLeaf: (data) => !data.hasChildren
      },
      timeout:0, //零件号加载的timeout
      machineCodeList: [],
      attachOption: {
        labelWidth: 160,
@@ -55,7 +74,11 @@
            type: 'input',
            span: 24,
            dataType: 'string',
            disabled:true,
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '零组件号',
@@ -64,14 +87,20 @@
            span: 12,
            dataType: 'string',
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '图号版次',
            label: '图纸版次',
            prop: 'drawingNoEdition',
            type: 'input',
            span: 12,
            dataType: 'string',
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '产品型号',
@@ -80,6 +109,9 @@
            span: 12,
            dataType: 'string',
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '工序号',
@@ -91,6 +123,9 @@
            dataType: 'string',
            max: 999,
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '工序名称',
@@ -99,6 +134,9 @@
            span: 12,
            dataType: 'string',
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '工序版次',
@@ -107,32 +145,28 @@
            span: 12,
            dataType: 'string',
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '工艺版次',
            label: '批次号',
            prop: 'craftEdition',
            placeholder:'如"A"',
            type: 'input',
            span: 12,
            dataType: 'string',
            maxlength: 2,
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            maxlength: 10,
            blur: (col) => {
              this.handleTrim(col)
            },
          },
          {
            label: '加工机床',
            prop: 'machineCode',
            type: 'select',
               filterable: true,
            dicUrl: `/blade-mdm/machine/page?size=10000`,
            dicFormatter: function (res) {
              that.machineCodeList = res.data.records;
              return res.data.records;
            },
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
            props: {
              label: 'code',
              value: 'code',
            },
            
            span: 12
          },
          {
@@ -157,7 +191,25 @@
            dataType: 'string',
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
          },
          
          {
            label: '主管工艺',
            prop: 'producePlanId',
            type: 'select',//column 12
            remote: true,
            placeholder:'无法匹配人员职责表时请选择主管工艺',
            dicUrl: `/blade-mdm/producedivision/select-programmer?programmer={{key}}`,
            dicFormatter:(res)=>{
              return res.data.map(obj => {
                let item = new Object();
                item.value = obj.id;
                item.label = obj.programmerName;
                item.desc = `专业组长：${obj.teamLeaderName},校对：${obj.checkerName},审核：${obj.checkerName}`
                return item;
              }); ;
            },
            span: 12,
            dataType: 'string',
          },
          {
            type:'hidden',
            prop:'isTempFlow',
@@ -166,10 +218,98 @@
          }
        ],
      },
      attachForm: {planLockDays:7},//默认7天
      attachForm: {planLockDays:7,planStartTime: this.$dayjs().format('YYYY-MM-DD')},//默认7天
      defaultForm: {planLockDays:7,planStartTime: this.$dayjs().format('YYYY-MM-DD')},
    };
  },
  methods: {
    treeLoad () {
      axios({
        url: '/blade-mdm/gkw/node/load-tree',
        method: 'get',
      }).then(
        res => {
          this.treeData = this.filterTreeData(res.data.data);
          var firstIndex = 0;
          res.data.data.forEach((item,index)=> {
            if(item.children.length != 0) {
              firstIndex = index;
            }
          })
          //defaultKeys.push(item.id);
          this.defaultKeys = [res.data.data[firstIndex].id];
        }
      )
    },
    filterTreeData(oriTreeData){
      var roots = [];
      for(var i=0;i<oriTreeData.length;i++){
        roots.push(this.filterTreeNodes(oriTreeData[i]));
      }
      return roots;
    },
    filterTreeNodes(node) {
      // 如果当前节点的nodeType是'machine'，则清除其子节点
      if (node.nodeType === 'machine') {
          // 创建一个新对象，复制当前节点的属性，但清除children
          return {
              ...node,
              children: []
          };
      }
      
      // 如果当前节点有子节点，递归处理每个子节点
      if (node.children && node.children.length > 0) {
          return {
              ...node,
              children: node.children.map(child => this.filterTreeNodes(child))
          };
      }
      
      // 如果既不是machine节点也没有子节点，直接返回原节点
      return node;
    },
    querySearchAsync(query, cb) {//零组件号搜索建议

      axios({
        url: '/blade-mdm/producedivision/select-data',
        method: 'get',
        params: {drawingNo: query},
      }).then(
        res => {
          if(res.data.code == 200){
            let list = res.data.data;
            for(let i of list){
              i.value = i.ljh;
            }

            clearTimeout(this.timeout)
            this.timeout = setTimeout(() => {
              cb(list);
            }, 1000)
            
          }
        },
        error => {
          console.log(error);
        }
      );
      
    },
    handleSelect(item) {
      this.attachForm.productModel = item.cph;
    },
    handleTrim(col){
      //console.log(col)
      let value = this.attachForm[col.column.prop];
      if (typeof value === 'string') {
            const trimmedValue = value.trim();
            // 只有当值确实发生变化时才更新
            if (trimmedValue !== value) {
                this.attachForm[col.column.prop] = trimmedValue;
            }
        }
    },
    formSubmit(form, done) {
      var form = { ...form };
      this.machineCodeList.forEach(item => {
@@ -177,18 +317,61 @@
          form.machineMode = item.name;
        }
      })
      if(this.attachForm.producePlanId){
        //手动指定了人员职责表id，不用继续从服务端验证
         this.startDispatch(form,done);
      }else{
        axios({
          url: '/blade-mdm/producedivision/select-by-drawingno',
          method: 'get',
          params: {drawingNo:this.attachForm.drawingNo},
        }).then(
          res => {
            
            if(res.data.code == 200){
              this.$message({
                type: 'success',
                message: '操作成功!',
              });
            
              this.attachForm.producePlanId = res.data.data.id;
              
              console.log('planid',this.attachForm.productPlanId)
              this.startDispatch(form,done);
            }else{
              
             
              this.$alert(res.data.msg+".重新输入或者手动选择主管工艺。", '发起任务失败',{type:'error',confirmButtonText:'关闭'});
            }
            done();
          },
          error => {
            console.log(error);
            done();
          }
        );
      }
      
    },

    startDispatch(form,done){
      axios({
        url: '/blade-mdm/flow/dispatch/start',
        method: 'post',
        data: form,
      }).then(
        res => {
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          this.$refs.form.resetForm();
          if(res.data.code == 200){
            this.$message({
              type: 'success',
              message: '操作成功!',
            });
            this.$refs.form.resetForm();
            this.attachForm = this.defaultForm;
            
          }else{
            this.$alert(res.data.msg, '发起任务失败',{type:'error',confirmButtonText:'关闭'});
          }
          done();
        },
        error => {
@@ -198,6 +381,9 @@
      );
    }
  },
   mounted() {
    this.treeLoad();
  },
};
</script>