车间订单工艺路线工序新增

chenhj

10 小时以前 cea76991456675d236ad6e42f572f49b00f17c9a

车间订单工艺路线工序新增

 src/api/plan/manufacturingorder.js

@@ -293,3 +293,11 @@
    data: ids
  })
}

export function addMoRoutingOperation(data) {
  return request({
    url: '/mes/plan/moRouting/addMoRoutingOperation',
    method: 'post',
    data: data
  })
}

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -7,8 +7,11 @@
        <h2 v-if="!editable">查看-车间订单</h2>
      </div>
      <div class="btn-group header-right" v-if="editable">
        <el-button :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
          type="primary">保存</el-button
        <el-button
          :disabled="isSubmit"
          v-thinclick="`dataFormSubmit`"
          type="primary"
          >保存</el-button
        >
      </div>
    </div>
@@ -65,15 +68,15 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="零件" prop="partId">
                <el-tooltip class="item" effect="dark" :content="partStr" >
                <el-input v-model="partStr" placeholder="" readonly>
                  <el-button
                    v-if="!this.dataForm.id"
                    slot="append"
                    icon="el-icon-search"
                    @click="openRoutingDialog()"
                  ></el-button>
                </el-input>
                <el-tooltip class="item" effect="dark" :content="partStr">
                  <el-input v-model="partStr" placeholder="" readonly>
                    <el-button
                      v-if="!this.dataForm.id"
                      slot="append"
                      icon="el-icon-search"
                      @click="openRoutingDialog()"
                    ></el-button>
                  </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
@@ -91,7 +94,7 @@
            <el-col :span="4">
              <el-form-item label="完成数量" prop="qtyFinished">
                <el-input-number
                  style= "width: 90%"
                  style="width: 90%"
                  v-model="dataForm.qtyFinished"
                  placeholder=""
                  :controls="false"
@@ -128,11 +131,15 @@
                ></el-input>
              </el-form-item>
            </el-col> -->
             <el-col :span="5">
            <el-col :span="5">
              <el-form-item label="备注" prop="remark">
                <el-tooltip class="item" effect="dark" :content="dataForm.remark">
                <el-input v-model="dataForm.remark" placeholder="">
                </el-input>
                <el-tooltip
                  class="item"
                  effect="dark"
                  :content="dataForm.remark"
                >
                  <el-input v-model="dataForm.remark" placeholder="">
                  </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
@@ -156,14 +163,21 @@
            </el-col>
            <el-col :span="10">
              <el-form-item label="工艺文件" prop="technologyDocumentName">
                 <el-tooltip class="item" effect="dark" :content="dataForm.technologyDocumentName">
                  <el-input v-model="dataForm.technologyDocumentName" placeholder="">
                </el-input>
                <el-tooltip
                  class="item"
                  effect="dark"
                  :content="dataForm.technologyDocumentName"
                >
                  <el-input
                    v-model="dataForm.technologyDocumentName"
                    placeholder=""
                  >
                  </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>
            <!-- <el-col
          <!-- <el-col
              :span="2"
              v-if="permissions.plan_manufacturingorder_bom_sure"
            >
@@ -189,7 +203,7 @@
                </el-switch>
              </el-form-item>
            </el-col> -->
            <!-- <el-col :span="2">
          <!-- <el-col :span="2">
              <el-form-item
                label="IFS车间订单接收时报告工序"
                prop="isReportOperation"
@@ -199,7 +213,7 @@
                </el-switch>
              </el-form-item>
            </el-col> -->
            <!-- <el-col :span="2">
          <!-- <el-col :span="2">
              <el-form-item label="BOM确认">
                <el-switch >
                </el-switch>
@@ -217,7 +231,6 @@
                </el-switch>
              </el-form-item>
            </el-col> -->

        </div>
        <div class="productorder-detail">
          <el-card class="productorder-list">
@@ -239,7 +252,7 @@
                            <el-option
                              v-for="item in dataForm.routingList"
                              :key="item.id"
                              :label="item.routingNo "
                              :label="item.routingNo"
                              :value="item.id"
                            >
                            </el-option>
@@ -267,7 +280,16 @@
                    </el-row>
                    <el-row>
                      <el-col :span="24" class="productorder-operates-col">
                        <el-card class="productorder-operates" >
                        <el-card class="productorder-operates">
                          <div style="display:flex;justify-content:flex-end;">
                            <el-button
                              style="padding: 3px 0;margin-right:10px;"
                              type="text"
                              size="medium"
                              @click="addOrderOperation"
                              >添加
                            </el-button>
                          </div>
                          <!-- <el-row>
                            <el-col :span="2" class="frame1">序号
                            </el-col>
@@ -296,14 +318,16 @@
                              min-width="50"
                              label="序号"
                            >
                            <template slot-scope="scope">
                              <template slot-scope="scope">
                                <div style="display:flex">
                                    <span style="width:20px;">
                                    <i class="icon aufontAll  h-icon-all-drag"></i
                                    ></span>
                                    <span>{{ scope.row.operationOrder }}</span>
                                  <span style="width:20px;">
                                    <i
                                      class="icon aufontAll  h-icon-all-drag"
                                    ></i
                                  ></span>
                                  <span>{{ scope.row.operationOrder }}</span>
                                </div>
                            </template>
                              </template>
                            </el-table-column>
                            <el-table-column
                              prop="operationNo"
@@ -338,6 +362,13 @@
                                  size="mini"
                                  @click.stop="openOrderOperation(scope.row)"
                                  >编辑
                                </el-button>
                                <el-button
                                  style="color:#f56c6c;"
                                  type="text"
                                  size="mini"
                                  @click.stop="deleteOrderOperation(scope.row)"
                                  >删除
                                </el-button>
                              </template>
                            </el-table-column>
@@ -548,7 +579,7 @@
                          </el-table>
                        </el-card>
                      </el-tab-pane>
                     <!--  <el-tab-pane
                      <!--  <el-tab-pane
                        label="检测标准"
                        key="tb1"
                        id="tb1"
@@ -986,25 +1017,25 @@
  </div>
</template>
<style lang="scss">
.frame{
    display: flex;
    justify-content: center;
    align-items: center;
    height: 100px;
    // border-width: 1px;
    // border-color: rgb(129, 129, 129);
    // border-style: solid;
    font-size: 15px;
}
.frame1{
.frame {
  display: flex;
    justify-content: center;
    align-items: center;
    height: 50px;
    // border-width: 1px;
    // border-color: rgb(129, 129, 129);
    // border-style: solid;
    font-size: 15px;
  justify-content: center;
  align-items: center;
  height: 100px;
  // border-width: 1px;
  // border-color: rgb(129, 129, 129);
  // border-style: solid;
  font-size: 15px;
}
.frame1 {
  display: flex;
  justify-content: center;
  align-items: center;
  height: 50px;
  // border-width: 1px;
  // border-color: rgb(129, 129, 129);
  // border-style: solid;
  font-size: 15px;
}
.productorder-basic {
  background-color: #fff;
@@ -1106,7 +1137,6 @@
/deep/ .el-input-number.is-without-controls .el-input__inner {
  text-align: start;
}

</style>
<script>
import {
@@ -1126,6 +1156,7 @@
  delMoBom,
  bomSelectChange,
  changeOrder,
  addMoRoutingOperation
} from '@/api/plan/manufacturingorder'
import { qryMoSamplingRule, delMoSamplingRule } from '@/api/plan/mosamplingrule'
import {
@@ -1177,7 +1208,7 @@

  data() {
    return {
      componentsTable:[],
      componentsTable: [],
      typeOptions: [],
      paramTemplateSelArr: [],
      paramTemplateSelCol: 'operationTemplateNo',
@@ -1233,7 +1264,7 @@
        isReportOperation: false,
        outPutBatchList: [],
        technologyDocumentId: null,
        technologyDocumentName: null,
        technologyDocumentName: null
      },
      currentRow: [],
      currentRouting: {}, // 当前选择的工艺
@@ -1244,7 +1275,7 @@
      operationTemplateList: [], // 参数集
      templateParamList: [], // 参数
      dataRule: {
        technologyDocumentName:[
        technologyDocumentName: [
          { required: true, message: '工艺文件不能为空', trigger: 'blur' }
        ],
        workshopTypeCode: [
@@ -1358,8 +1389,7 @@
        }
      }
    },
    components(newVal,oldVal){
    },
    components(newVal, oldVal) {},
    currentRouting(newValue, oldValue) {
      if (newValue && newValue.id) {
        if (this.dataForm.id != null && this.dataForm.id !== 0) {
@@ -1457,7 +1487,11 @@
              .filter((e) => e.operationOrder == oldIndex + 1)
              .forEach((e) => (e.operationOrder = 'x'))
            that.operations
              .filter((e) => e.operationOrder > oldIndex + 1 && e.operationOrder <= newIndex + 1)
              .filter(
                (e) =>
                  e.operationOrder > oldIndex + 1 &&
                  e.operationOrder <= newIndex + 1
              )
              .forEach((e) => (e.operationOrder = e.operationOrder - 1))
            that.operations
              .filter((e) => e.operationOrder == 'x')
@@ -1468,44 +1502,51 @@
              .filter((e) => e.operationOrder == oldIndex + 1)
              .forEach((e) => (e.operationOrder = 'x'))
            that.operations
              .filter((e) => e.operationOrder < oldIndex + 1 && e.operationOrder >= newIndex + 1)
              .filter(
                (e) =>
                  e.operationOrder < oldIndex + 1 &&
                  e.operationOrder >= newIndex + 1
              )
              .forEach((e) => (e.operationOrder = e.operationOrder + 1))
            that.operations
              .filter((e) => e.operationOrder == 'x')
              .forEach((e) => (e.operationOrder = newIndex + 1))
          }
          // 拖拽结束后，保存新的排序
          let data = that.operations.map(el =>{
          const data = that.operations.map((el) => {
            return {
              id:el.id,
              operationOrder:el.operationOrder,
              id: el.id,
              operationOrder: el.operationOrder
            }
          })
          changeOrder(data).then().catch(error => {
                console.error(error)
          });
          changeOrder(data)
            .then()
            .catch((error) => {
              console.error(error)
            })
        }
      })
    },
    dragEnd(e){
    dragEnd(e) {
      this.operations.forEach((e, i) => {
        e.index = i + 1
        e.operationOrder = i+1
        e.operationOrder = i + 1
      })
      console.log(this.operations,"拖拽结束kk");
      console.log(this.operations, '拖拽结束kk')
      this.dragEndstart()
    },
    dragEndstart(){
        let data = this.operations.map(el =>{
            return {
              id:el.id,
              operationOrder:el.operationOrder,
            }
    dragEndstart() {
      const data = this.operations.map((el) => {
        return {
          id: el.id,
          operationOrder: el.operationOrder
        }
      })
      changeOrder(data)
        .then((res) => {})
        .catch((error) => {
          console.error(error)
        })
        changeOrder(data).then((res) =>{
        }).catch(error => {
            console.error(error)
        });
    },
    getSysParam(paramKey) {
      getSysParam(paramKey).then((response) => {
@@ -1575,7 +1616,7 @@
    },
    // 查询当前车间订单信息
    getOrderInfo() {
      let that=this
      const that = this
      getManufacturingOrder(this.dataForm.id).then((response) => {
        this.dataForm = response.data.data
        // 把工艺挂上去
@@ -1745,7 +1786,7 @@
      this.showRouting = true
    },
    selectRouting(param) {
      console.log(param);
      console.log(param)
      if (param) {
        this.dataForm.partNo = param.partNo
        this.dataForm.partName = param.partName
@@ -1771,7 +1812,7 @@
      })
    },
    // 2.tabs-工艺路线
    //工艺文件选择
    // 工艺文件选择

    // 工艺路线选择
    routingSelectChanged(routingId) {
@@ -1846,8 +1887,8 @@
    },
    // 点击工艺工序行触发校验工艺是否修改，若修改则不可操作，需先保存，若未修改，则可查询出对应的参数集
    operationRowClick(row) {
        //   const row = this.operations[event.oldIndex]
          console.log(row);
      //   const row = this.operations[event.oldIndex]
      console.log(row)
      if (this.dataForm.id != null && this.dataForm.id !== 0) {
        this.routingOperationId = row.technologyRoutingOperationId
        this.moRoutingOperationId = row.id
@@ -2101,11 +2142,14 @@
    },
    // 保存所有参数的修改
    saveAllParamChange() {
      this.templateParamList.forEach(e=>{
        if(e.paramValue!=null){
          e.paramValue=e.paramValue.replace(',','，').replace('(','（').replace(')','）')
      this.templateParamList.forEach((e) => {
        if (e.paramValue != null) {
          e.paramValue = e.paramValue
            .replace(',', '，')
            .replace('(', '（')
            .replace(')', '）')
          if (!isNaN(e.paramValue)) {
            e.paramValue='='+e.paramValue
            e.paramValue = '=' + e.paramValue
          }
        }
      })
@@ -2217,43 +2261,50 @@
    },
    // 删除当前工序
    deleteOrderOperation(row) {
      deleteMoRoutingOperation(row.id).then((response) => {
        const resData = response.data
        if (resData.code === 0) {
          const delOperation = this.operations.find((item) => {
            return item.id === row.id
          })
          const delIndex = this.operations.indexOf(delOperation)
          this.operations.splice(delIndex, 1)

          // 查找当前的选中的工序id
          const selectedOperation = this.operations.find((item) => {
            return item.id === this.moRoutingOperationId
          })
          // 存在选中的工序
          if (selectedOperation) {
            this.operationRowClick(selectedOperation)
          } else {
            // 不存在选中的工序，若this.operations不为空，则取第一条工序，若为空，则清空相关工序
            if (this.operations.length > 0) {
              this.operationRowClick(this.operations[0])
            } else {
              // 取消选中高亮
              this.$refs.operationTable.setCurrentRow()
              // 清空当前工艺工序id、清空routingTemplateId、清空参数集operationTemplateList、清空参数templateParamList
              this.routingOperationId = null
              this.moRoutingOperationId = null
              this.moRoutingOperationName = null
              this.routingTemplateId = null
              this.operationTemplateList = []
              this.templateParamList = []
            }
          }
          this.$message.success('订单工序删除成功')
        } else {
          this.$message.error('订单工序删除失败')
        }
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      })
        .then(() => {
          deleteMoRoutingOperation(row.id).then((response) => {
            const resData = response.data
            if (resData.code === 0) {
              const delOperation = this.operations.find((item) => {
                return item.id === row.id
              })
              const delIndex = this.operations.indexOf(delOperation)
              this.operations.splice(delIndex, 1)

              // 查找当前的选中的工序id
              const selectedOperation = this.operations.find((item) => {
                return item.id === this.moRoutingOperationId
              })
              // 存在选中的工序
              if (selectedOperation) {
                this.operationRowClick(selectedOperation)
              } else {
                // 不存在选中的工序，若this.operations不为空，则取第一条工序，若为空，则清空相关工序
                if (this.operations.length > 0) {
                  this.operationRowClick(this.operations[0])
                } else {
                  // 取消选中高亮
                  this.$refs.operationTable.setCurrentRow()
                  // 清空当前工艺工序id、清空routingTemplateId、清空参数集operationTemplateList、清空参数templateParamList
                  this.routingOperationId = null
                  this.moRoutingOperationId = null
                  this.routingTemplateId = null
                  this.operationTemplateList = []
                  this.templateParamList = []
                }
              }
              this.$message.success('订单工序删除成功')
            } else {
              this.$message.error('订单工序删除失败')
            }
          })
        })
        .catch(() => {})
    },
    // 弹出基础工序列表
    addOrderOperation() {
@@ -2286,6 +2337,27 @@
    },
    // 新增工序
    addOperation(operation) {
      operation.moId = this.dataForm.id
      operation.moRoutingId = this.dataForm.technologyRoutingId
      operation.operationId = operation.id
      operation.partId = this.dataForm.partId
      operation.loc = null
      operation.operationOrder = this.operations.length + 1
      operation.id = null
      addMoRoutingOperation(operation).then((response) => {
        const data = response.data
        if (data.code === 0) {
          getMoRoutingOption(this.dataForm.id).then((response) => {
            if (response.data.code === 0) {
              this.operations = response.data.data
            } else {
              this.operations = []
            }
          })
        } else {
          this.$message.error('添加失败')
        }
      })
    },
    insertOperation(operation) {},
    structSelectionChange(val) {