zss
2024-01-11 84372c9063b8fa92a6cb392708cfc34ea5648f43
车间订单修改工艺文件
已修改4个文件
155 ■■■■ 文件已修改
src/views/plan/manufacturingorder/productorder-form.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/manufacturingorder/routing.vue 124 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/finishedProductInspection/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/processInspect/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/manufacturingorder/productorder-form.vue
@@ -154,6 +154,14 @@
                </el-select>
              </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-row>
            <!-- <el-col
              :span="2"
@@ -1113,7 +1121,9 @@
        endDate: null,
        manufactureAttr: 'N',
        isReportOperation: false,
        outPutBatchList: []
        outPutBatchList: [],
        technologyDocumentId: null,
        technologyDocumentName: null,
      },
      currentRow: [],
      currentRouting: {}, // 当前选择的工艺
@@ -1124,6 +1134,9 @@
      operationTemplateList: [], // 参数集
      templateParamList: [], // 参数
      dataRule: {
        technologyDocumentName:[
          { required: true, message: '工艺文件不能为空', trigger: 'blur' }
        ],
        workshopTypeCode: [
          { required: true, message: '车间订单类型不能为空', trigger: 'blur' }
        ],
@@ -1420,13 +1433,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
@@ -1562,10 +1569,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) => {})
      }
    },
@@ -1585,6 +1595,8 @@
      })
    },
    // 2.tabs-工艺路线
    //工艺文件选择
    // 工艺路线选择
    routingSelectChanged(routingId) {
      this.currentRouting = this.dataForm.routingList.find(
src/views/plan/manufacturingorder/routing.vue
@@ -31,7 +31,7 @@
  </el-dialog>
</template>
<script>
import { fetchList } from '@/api/technology/routing'
import { fetchList } from '@/api/technology/document'
import ttable from '@/views/common/ztt-table.vue'
import { remote } from '@/api/admin/dict'
export default {
@@ -73,12 +73,12 @@
        border: true, // 是否有纵向边框
        lazy: false, // 是否需要懒加载
        fit: true, // 列的宽度是否自撑开
        multiSelect: false, //
        multiSelect: true, //
        seqNo: true,
        isRefresh: true, // 是否显示刷新按钮
        isShowHide: true, // 是否显示显影按钮
        isSearch: false, // 高级查询按钮
        defaultOrderBy: { column: 'updateTime', direction: 'desc' }
        isShowHide: true, // 是否显示显影按钮H
        isSearch: true, // 高级查询按钮
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
      table: {
        total: 0,
@@ -89,62 +89,62 @@
        column: [
          {
            minWidth: '100',
            prop: 'routingNo',
            label: '工艺编号',
            prop: 'number',
            label: '文件编号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'name',
            label: '文件名称',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 工艺类型
          // {
          //   minWidth: '120',
          //   prop: 'bomTypeDb',
          //   label: '工艺类型',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: false,
          //   searchInfoType: 'select',
          //   formatter: this.formatBomTypeDbType,
          //   optList: () => {
          //     return this.bomTypeDbOptions
          //   }
          // },
          // {
          //   minWidth: '100',
          //   prop: 'name',
          //   label: '工艺名称',
          //   prop: 'master',
          //   label: '主工艺',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          //   searchInfoType: 'select',
          //   formatter: this.getMaster,
          //   optList: () => {
          //     return this.getMasterList()
          //   }
          // },
          // 工艺类型
          {
            minWidth: '120',
            prop: 'bomTypeDb',
            label: '工艺类型',
            sort: true,
            isTrue: true,
            isSearch: false,
            searchInfoType: 'select',
            formatter: this.formatBomTypeDbType,
            optList: () => {
              return this.bomTypeDbOptions
            }
          },
          {
            minWidth: '100',
            prop: 'master',
            label: '主工艺',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            formatter: this.getMaster,
            optList: () => {
              return this.getMasterList()
            }
          },
          {
            minWidth: '100',
            prop: 'state',
            label: '状态',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            formatter: this.getMasterState,
            optList: () => {
              return this.getMasterStateList()
            }
          },
          // {
          //   minWidth: '100',
          //   prop: 'state',
          //   label: '状态',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   formatter: this.getMasterState,
          //   optList: () => {
          //     return this.getMasterStateList()
          //   }
          // },
          {
            minWidth: '100',
            prop: 'description',
@@ -154,16 +154,16 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'partName',
            label: '零件名',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',
            noShowTip: false
          },
          // {
          //   minWidth: '120',
          //   prop: 'partName',
          //   label: '零件名',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text',
          //   noShowTip: false
          // },
          {
            minWidth: '120',
            prop: 'partNo',
@@ -202,7 +202,7 @@
          label: '草稿'
        },
        {
          value: '02accepted',
          value: '02pending',
          label: '已接受'
        },
        {
@@ -285,7 +285,7 @@
    currshowlist() {
      this.innerVisible = this.currshowlist
      if (this.currshowlist) {
        this.queryParam.state = '02accepted'
        this.queryParam.state = '03accepted'
        this.$nextTick(() => {
          this.getData()
        })
src/views/quality/finishedProductInspection/index.vue
@@ -108,7 +108,6 @@
                    },
                    {
                        minWidth: '130',
                        width: '150',
                        prop: 'projectName',
                        label: '工程名称',
                        sort: true,
@@ -134,8 +133,9 @@
                    },
                    {
                        minWidth: '120',
                        width: '150',
                        prop: 'material',
                        label: '产品大类',
                        label: '产品名称',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text'
src/views/quality/processInspect/index.vue
@@ -90,7 +90,6 @@
                        },
                        {
                            minWidth: '130',
                            width: '150',
                            prop: 'specs',
                            label: '规格型号',
                            sort: true,