工艺路线-bug修改

zouyu

2023-12-26 e155da2aeb9c44698e3a0d59ab3f32e5ad9bad5f

工艺路线-bug修改

 src/views/plan/productionschedul/index.vue

@@ -2,12 +2,12 @@
  <div class="mod-config">
    <basic-container>
      <el-row>
        <el-col :span="14">
          <el-row>
        <el-col :span="14" style="height:100vh">
          <el-row style="height:50%;padding:0px 10px;">
            <el-col :span="24">
              <div style="height:40vh;padding: 0px 10px;">
                <span style="position: relative;top:40px;">未完成</span>
                <span style="position: relative;top:30px;left:60%;z-index: 11">
              <div>
                <span style="position: relative;top:40px;color:#E84738">未完成</span>
                <span style="position: relative;top:30px;left:61%;z-index: 11">
                  <el-button @click="tagFinished" size="mini" round type="primary">标记已完成</el-button>
                  <el-button size="mini" round type="primary"
                  v-if="permissions.plan_productionschedul_edit_line" 
@@ -18,7 +18,7 @@
                ref="crud" 
                :option="option" 
                :span-method="spanMethod" 
                @refresh-change="getUnFinishedData"
                @refresh-change="getDataList"
                @current-change="handleCurrentChange"
                @size-change="handleSizeChange"
                :page="page" 
@@ -42,10 +42,10 @@
              </div>
            </el-col>
          </el-row>
          <el-row>
          <el-row style="height:50%;padding:0px 10px;">
            <el-col :span="24">
              <div style="height:40vh;padding: 0px 10px;">
                <span style="position: relative;top:40px">已完成</span>
              <div>
                <span style="position: relative;top:0px;color:#34BD66">已完成</span>
                <avue-crud 
                :data="finishedTableData" 
                ref="finished" 
@@ -75,7 +75,7 @@
              <div slot="header" class="clearfix">
                <span>调度时间线</span>
              </div>
              <div style="height:70vh;overflow-y: scroll;">
              <div style="height:100vh;overflow-y: scroll;">
                <el-timeline>
                    <el-timeline-item
                      placement="top"
@@ -223,7 +223,7 @@
          prop:'id',
          order:'descending'
        },
        height: 200,
        height: 230,
        selection: true,
        columnBtn: false,
        index: true,
@@ -333,7 +333,7 @@
          prop:'id',
          order:'descending'
        },
        height: 180,
        height: 250,
        selection: true,
        columnBtn: false,
        index: true,
@@ -497,6 +497,11 @@
          productionStatus: null,
        }
      }
    },
    multipleSelection(newVal){
      if(newVal.length==0){
        this.scheduleList = []
      }
    }
  },
  mounted() {
@@ -552,10 +557,13 @@
        return ele.mid
      })
      checkTimeLines(mIds).then(res=>{
        console.log(res);
        if(res.data.code===200){
          this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
        if(res.data.data.length==1){
          let dataList = this.initTimeLine(res.data.data[0])
          this.scheduleEditList = dataList
          console.log(this.scheduleEditList);
          this.dialogVisible = true
        }else{
          this.$message.error("选中数据的调度时间线不一致!")
        }
      }).catch(error=>{
        console.error(error);
@@ -563,7 +571,9 @@
    },
    confirmEditSchedul(){
      let data = this.scheduleEditList
      let orderObj = this.multipleSelection[0]
      let mIds = this.multipleSelection.map(ele=>{
        return ele.mid
      })
      let obj = {
        "documentActualTime": data[0].actualTime,
        "documentPlanTime": data[0].planTime,
@@ -577,13 +587,13 @@
        "checkPlanTime": data[4].planTime,
        "productActualTime": data[5].actualTime,
        "productPlanTime": data[5].planTime,
        "id": orderObj.id,
        "contractNo": orderObj.contractNo,
        "customerName": orderObj.customerName,
        "deliveryDate": orderObj.deliveryDate,
        "orderTime": orderObj.orderTime,
        "productType": orderObj.productType,
        "projectName": orderObj.projectName
        "mids": mIds,
        // "contractNo": orderObj.contractNo,
        // "customerName": orderObj.customerName,
        // "deliveryDate": orderObj.deliveryDate,
        // "orderTime": orderObj.orderTime,
        // "productType": orderObj.productType,
        // "projectName": orderObj.projectName
      }
      fillTime(obj).then(res=>{
        if(res.status===200){
@@ -602,7 +612,7 @@
      done()
    },
    initTimeLine(data){
      this.scheduleList = []
      let scheduleList = []
      if(data){
        let arr = [
          {
@@ -636,13 +646,14 @@
            planTime: data.productPlanTime,
          },
        ]
        this.scheduleList = arr
        scheduleList = arr
        return scheduleList
      }
    },
    getScheduleById(id){
      if(id){
        fetchScheduleById(id).then(res=>{
          this.initTimeLine(res.data.data)
          this.scheduleList = this.initTimeLine(res.data.data)
        }).catch(error=>{
          console.log(error);
        })
@@ -692,6 +703,10 @@
      }
    },
    // 获取数据列表
    getDataList(){
      this.getUnFinishedData()
      this.getFinishedData()
    },
    getUnFinishedData() {
      this.loading = true
      let param = {
@@ -725,7 +740,7 @@
    // 删除
    deleteHandle(row,index) {
      const _than = this
      _than.$confirm('是否确认删除', '提示', {
      _than.$confirm('是否确认删除该生产调度信息', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'