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

王震

2024-01-17 e5423f35d43042de23cb296429ee9c6be3813afe

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

@@ -8,7 +8,7 @@
      </div>
      <div class="btn-group header-right" v-if="editable">
        <el-button :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
          >保存</el-button
          type="primary">保存</el-button
        >
      </div>
    </div>
@@ -65,6 +65,7 @@
            </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"
@@ -73,11 +74,12 @@
                    @click="openRoutingDialog()"
                  ></el-button>
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="10">
            <el-col :span="3">
            <el-col :span="4">
              <el-form-item label="需求数量" prop="qtyRequired">
                <el-input
                  v-model="dataForm.qtyRequired"
@@ -86,9 +88,10 @@
                ></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="3">
            <el-col :span="4">
              <el-form-item label="完成数量" prop="qtyFinished">
                <el-input-number
                  style= "width: 90%"
                  v-model="dataForm.qtyFinished"
                  placeholder=""
                  :controls="false"
@@ -107,7 +110,7 @@
                </el-date-picker>
              </el-form-item>
            </el-col>
            <el-col :span="6">
            <!-- <el-col :span="6">
              <el-form-item label="外护颜色" prop="outerColor">
                <el-input
                  readonly
@@ -124,16 +127,16 @@
                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>
          </el-row>

          <el-row :gutter="10">
            <el-col :span="6">
            </el-col> -->
             <el-col :span="5">
              <el-form-item label="备注" prop="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>
            <el-col :span="6">
            <el-col :span="5">
              <el-form-item label="制造属性" prop="manufactureAttr">
                <el-select
                  v-model="dataForm.manufactureAttr"
@@ -151,44 +154,51 @@
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-col
                :span="8"
                v-if="permissions.plan_manufacturingorder_bom_sure"
              >
                <el-form-item label="BOM确认">
                  <el-switch v-model="dataForm.bomConfirmStatus"> </el-switch>
                </el-form-item>
              </el-col>
              <el-col
                :span="8"
                v-if="permissions.plan_manufacturingorder_process_sure"
              >
                <el-form-item label="工艺确认">
                  <el-switch v-model="dataForm.processConfirmStatus">
                  </el-switch>
                </el-form-item>
              </el-col>
              <el-col
                :span="8"
                v-if="permissions.plan_manufacturingorder_test_sure"
              >
                <el-form-item label="检测标准确认">
                  <el-switch v-model="dataForm.standardConfirmStatus">
                  </el-switch>
                </el-form-item>
              </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>
              </el-form-item>
            </el-col>
            <el-col :span="4">
          </el-row>
            <!-- <el-col
              :span="2"
              v-if="permissions.plan_manufacturingorder_bom_sure"
            >
              <el-form-item label="BOM确认" label-width="110px">
                <el-switch v-model="dataForm.bomConfirmStatus"> </el-switch>
              </el-form-item>
            </el-col>
            <el-col
              :span="2"
              v-if="permissions.plan_manufacturingorder_process_sure"
            >
              <el-form-item label="工艺确认" label-width="110px">
                <el-switch v-model="dataForm.processConfirmStatus">
                </el-switch>
              </el-form-item>
            </el-col>
            <el-col
              :span="2"
              v-if="permissions.plan_manufacturingorder_test_sure"
            >
              <el-form-item label="检测标准确认" label-width="140px">
                <el-switch v-model="dataForm.standardConfirmStatus">
                </el-switch>
              </el-form-item>
            </el-col> -->
            <!-- <el-col :span="2">
              <el-form-item
                label="IFS车间订单接收时报告工序"
                prop="isReportOperation"
                label-width="200px"
                label-width="250px"
              >
                <el-switch v-model="dataForm.isReportOperation" disabled>
                </el-switch>
              </el-form-item>
            </el-col>
            </el-col> -->
            <!-- <el-col :span="2">
              <el-form-item label="BOM确认">
                <el-switch >
@@ -207,7 +217,7 @@
                </el-switch>
              </el-form-item>
            </el-col> -->
          </el-row>

        </div>
        <div class="productorder-detail">
          <el-card class="productorder-list">
@@ -229,15 +239,7 @@
                            <el-option
                              v-for="item in dataForm.routingList"
                              :key="item.id"
                              :label="
                                item.routingNo +
                                  '-' +
                                  item.bomTypeDb +
                                  '-' +
                                  item.alternativeNo +
                                  '-' +
                                  item.alternativeDesc
                              "
                              :label="item.routingNo "
                              :value="item.id"
                            >
                            </el-option>
@@ -263,11 +265,22 @@
                        </el-form-item>
                      </el-col>
                    </el-row>

                    <el-row>
                      <el-col :span="24" class="productorder-operates-col">
                        <el-card class="productorder-operates">
                          <el-table
                        <el-card class="productorder-operates" >
                          <el-row>
                            <el-col :span="2" class="frame1">序号
                            </el-col>
                            <el-col :span="4" class="frame1">工序号
                            </el-col>
                            <el-col :span="5" class="frame1">工序描述
                            </el-col>
                            <el-col :span="9" class="frame1">零件
                            </el-col>
                            <el-col :span="3" class="frame1">操作
                            </el-col>
                          </el-row>
                          <!-- <el-table
                            ref="operationTable"
                            :data="operations"
                            style="width: 100%;"
@@ -315,10 +328,49 @@
                                </el-button>
                              </template>
                            </el-table-column>
                          </el-table>
                          </el-table> -->
                          <zttdraggable
                            :forceFallback="true"
                            :list="operations"
                            :animation="200"
                            fallbackClass="fallbackStyle"
                            ghostClass="item_ghost"
                            @end="dragEnd"
                            :default-sort="{ prop: 'operationOrder' }"
                            @choose="operationRowClick"
                          >
                            <div
                              :class="{ dragItem: true, active: x.active }"
                              v-for="(x, i) in operations"
                              :key="i"
                            >
                              <el-row>
                                <el-col :span="2" class="frame">{{ i+1 }}
                                </el-col>
                                <el-col :span="4" class="frame">{{ x.operationNo  }}
                                </el-col>
                                <el-col :span="5" class="frame">{{ x.operationName }}
                                </el-col>
                                <el-col :span="9" class="frame">{{ x.partName }}
                                </el-col>
                                <el-col :span="3" class="frame">
                                    <el-button
                                      type="text"
                                      size="mini"
                                      @click="openOrderOperation(x)"
                                      >编辑
                                    </el-button>
                                </el-col>
                              </el-row>
                            </div>
                          </zttdraggable>
                        </el-card>
                      </el-col>
                    </el-row>
                  
                  
                  
                  
                  </el-col>
                  <el-col :span="16">
                    <el-tabs type="card" ref="paramTabs">
@@ -487,7 +539,7 @@
                          </el-table>
                        </el-card>
                      </el-tab-pane>
                      <el-tab-pane
                     <!--  <el-tab-pane
                        label="检测标准"
                        key="tb1"
                        id="tb1"
@@ -500,8 +552,8 @@
                          :moRoutingOperationId="moRoutingOperationId"
                          @refreshTestStandardInfo="refreshTestStandardInfo"
                        ></testStandardTable>
                      </el-tab-pane>
                      <el-tab-pane
                      </el-tab-pane> -->
                      <!-- <el-tab-pane
                        label="抽检规则"
                        key="tb2"
                        id="tb2"
@@ -587,7 +639,7 @@
                            </el-table>
                          </div>
                        </div>
                      </el-tab-pane>
                      </el-tab-pane> -->
                    </el-tabs>
                  </el-col>
                </el-row>
@@ -595,8 +647,19 @@

              <el-tab-pane label="产品结构" id="ta1" key="ta1" name="ta1">
                <el-row>
                  <el-col :span="11">
                    <el-form-item label="完整BOM">
                  <el-col :span="2" style="text-align: center">
                    <el-button
                      type="text"
                      size="small"
                      icon="el-icon-circle-plus-outline"
                      style="color:#f56c6c;"
                      :disabled="!dataForm.id"
                      @click="addStruct()"
                      >添加元素
                    </el-button>
                  </el-col>
                  <el-col :offset="11" :span="11">
                    <!-- <el-form-item label="完整BOM">
                      <el-select
                        @change="bomSelectChanged"
                        disabled
@@ -622,35 +685,18 @@
                        >
                        </el-option>
                      </el-select>
                    </el-form-item>
                  </el-col>
                  <el-col :offset="11" :span="2" style="text-align: center">
                    <el-button
                      type="text"
                      size="small"
                      icon="el-icon-circle-plus-outline"
                      style="color:#f56c6c;"
                      :disabled="!dataForm.id"
                      @click="addStruct()"
                      >添加元素
                    </el-button>
                    </el-form-item> -->
                  </el-col>
                </el-row>
                <el-row>
                  <el-table
                    default-expand-all
                    :data="components"
                    :data="components[0]"
                    @selection-change="structSelectionChange"
                    row-key="id"
                    border
                    :tree-props="{
                      children: 'children'
                    }"
                    style="width: 100%"
                    height="400px"
                    :default-sort="{ prop: 'index' }"
                  >
                    <el-table-column type="selection" width="40" fixed="left" />
                    <!-- <el-table-column type="selection" width="40" fixed="left" /> -->
                    <el-table-column
                      type="index"
                      width="50"
@@ -668,7 +714,7 @@
                    />
                    <el-table-column
                      prop="partName"
                      width=""
                      width="200"
                      header-align="center"
                      align="left"
                      label="零件"
@@ -707,13 +753,13 @@
                      label="单位"
                    />

                    <el-table-column
                    <!-- <el-table-column
                      prop="discNum"
                      width="150"
                      header-align="center"
                      align="center"
                      label="盘数(盘)"
                    />
                    /> -->

                    <!-- <el-table-column
                      prop="version"
@@ -930,7 +976,27 @@
    />
  </div>
</template>
<style>
<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{
  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;
  height: 150px;
@@ -969,6 +1035,7 @@
.productorder-operates {
  height: 605px;
  border: 1px solid #ddd;
  overflow: auto;
}

.productorder-params-template {
@@ -1020,7 +1087,8 @@
  addRoutingTemplateParamLedForOrder,
  updateMoBom,
  delMoBom,
  bomSelectChange
  bomSelectChange,
  changeOrder,
} from '@/api/plan/manufacturingorder'
import { qryMoSamplingRule, delMoSamplingRule } from '@/api/plan/mosamplingrule'
import {
@@ -1050,7 +1118,7 @@
import spotCheckRule from './orderSpotCheckRule'
import spotCheckRuleEdit from './orderSpotCheckRuleEdit'
import { mapGetters } from 'vuex'

import zttdraggable from 'vuedraggable'
export default {
  components: {
    CustomerOrder,
@@ -1066,11 +1134,13 @@
    operationDialog,
    insertOperationDialog,
    spotCheckRule,
    spotCheckRuleEdit
    spotCheckRuleEdit,
    zttdraggable
  },

  data() {
    return {
      componentsTable:[],
      typeOptions: [],
      paramTemplateSelArr: [],
      paramTemplateSelCol: 'operationTemplateNo',
@@ -1124,7 +1194,9 @@
        endDate: null,
        manufactureAttr: 'N',
        isReportOperation: false,
        outPutBatchList: []
        outPutBatchList: [],
        technologyDocumentId: null,
        technologyDocumentName: null,
      },
      currentRow: [],
      currentRouting: {}, // 当前选择的工艺
@@ -1135,6 +1207,9 @@
      operationTemplateList: [], // 参数集
      templateParamList: [], // 参数
      dataRule: {
        technologyDocumentName:[
          { required: true, message: '工艺文件不能为空', trigger: 'blur' }
        ],
        workshopTypeCode: [
          { required: true, message: '车间订单类型不能为空', trigger: 'blur' }
        ],
@@ -1245,7 +1320,8 @@
        }
      }
    },

    components(newVal,oldVal){
    },
    currentRouting(newValue, oldValue) {
      if (newValue && newValue.id) {
        if (this.dataForm.id != null && this.dataForm.id !== 0) {
@@ -1295,7 +1371,7 @@
      if (newValue && newValue.id) {
        // 查询产品结构对应的组件
        getBom(newValue.id).then((response) => {
          this.components = [response.data.data.tree]
          // this.components = [response.data.data.tree]
        })
      }
    },
@@ -1329,6 +1405,26 @@
    }
  },
  methods: {
    dragEnd(e){
      this.operations.forEach((e, i) => {
        e.index = i + 1
        e.operationOrder = i+1
      })
      console.log(this.operations,"拖拽结束kk");
      this.dragEndstart()
    },
    dragEndstart(){
        let data = this.operations.map(el =>{
            return {
              id:el.id,
              operationOrder:el.operationOrder,
            }
        })
        changeOrder(data).then((res) =>{
        }).catch(error => {
               console.error(error)
            });
    },
    getSysParam(paramKey) {
      getSysParam(paramKey).then((response) => {
        var paramVal = response.data.data
@@ -1397,6 +1493,7 @@
    },
    // 查询当前车间订单信息
    getOrderInfo() {
      let that=this
      getManufacturingOrder(this.dataForm.id).then((response) => {
        this.dataForm = response.data.data
        // 把工艺挂上去
@@ -1416,7 +1513,7 @@
        }
        // 把产品结构组件挂上去
        if (this.dataForm.bomRoot) {
          this.components = [this.dataForm.bomRoot]
          that.components = [this.dataForm.bomRoot]
        }
      })
    },
@@ -1429,13 +1526,7 @@
      checkPart(value, this.dataForm.workshopTypeCode)
        .then((response) => {
          const manufacturingOrderDTO = response.data.data
          /* this.dataForm.routingList = manufacturingOrderDTO.routingList.filter(
            (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
          ) */
          this.dataForm.routingList = manufacturingOrderDTO.routingList
          /* this.dataForm.bomList = manufacturingOrderDTO.bomList.filter(
            (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
          ) */
          this.dataForm.bomList = manufacturingOrderDTO.bomList
          this.dataForm.technologyRoutingId =
            manufacturingOrderDTO.technologyRoutingId
@@ -1571,10 +1662,13 @@
      this.showRouting = true
    },
    selectRouting(param) {
      console.log(param);
      if (param) {
        this.dataForm.partNo = param.partNo
        this.dataForm.partName = param.partName
        this.dataForm.partId = param.partId
        this.dataForm.technologyDocumentId = param.id
        this.dataForm.technologyDocumentName = param.name
        this.$refs.dataForm.validateField('partId', (valid) => {})
      }
    },
@@ -1594,6 +1688,8 @@
      })
    },
    // 2.tabs-工艺路线
    //工艺文件选择
    
    // 工艺路线选择
    routingSelectChanged(routingId) {
      this.currentRouting = this.dataForm.routingList.find(
@@ -1666,7 +1762,8 @@
      this.dataForm.bomId = null
    },
    // 点击工艺工序行触发校验工艺是否修改，若修改则不可操作，需先保存，若未修改，则可查询出对应的参数集
    operationRowClick(row) {
    operationRowClick(event) {
          const row = this.operations[event.oldIndex]
      if (this.dataForm.id != null && this.dataForm.id !== 0) {
        this.routingOperationId = row.technologyRoutingOperationId
        this.moRoutingOperationId = row.id
@@ -2097,7 +2194,6 @@
    },
    // 新增工序
    addOperation(operation) {
      console.log('operation', operation)
    },
    insertOperation(operation) {},
    structSelectionChange(val) {
@@ -2105,17 +2201,17 @@
    },
    // 打开bom节点
    addStruct() {
      if (this.structSelection.length <= 0) {
        this.$message.error('请选择需要添加元素的节点')
      } else {
        if (this.structSelection.length === 1) {
          this.selectedStruct = this.structSelection[0]
          this.moId = this.dataForm.id
          this.showStructForm = true
        } else {
          this.$message.error('只能为单个节点添加元素')
        }
      }
      this.selectedStruct = this.structSelection[0]
      this.moId = this.dataForm.id
      this.showStructForm = true
      // if (this.structSelection.length <= 0) {
      //   this.$message.error('请选择需要添加元素的节点')
      // } else {
      //   if (this.structSelection.length === 1) {
      //   } else {
      //     this.$message.error('只能为单个节点添加元素')
      //   }
      // }
    },
    refreshBom(node) {
      if (this.selectedStruct.children != null) {