modified: src/views/plan/manufacturingorder/index.vue modified: src/v...

zouyu

2023-11-17 da81627f0b578ea7858ddae6e2fe7991dc734eb0

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

 src/views/plan/manufacturingorder/index.vue

@@ -91,14 +91,14 @@
            :loading="loadingStructIfs"
            >物料同步ERP
          </el-button> -->
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_refresh_ifsorder"
            @click="refreshIfsorder()"
            type="primary"
            style="margin-left:10px;"
            :loading="refreshIfsorderLoading"
            >刷新ifs车间订单号
          </el-button>
          </el-button> -->

          <el-button
            @click="exportExcel"
@@ -823,14 +823,7 @@
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.searchStock
          }
        ],
        operator: null,
        operatorConfig: {
          fixed: 'right',
          label: '操作',

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

@@ -495,8 +495,8 @@
                        <testStandardTable
                          ref="moTestStandardTable"
                          :editable="editable"
                          :dataFormId="dataForm.id"
                          :moRoutingOperationId="moRoutingOperationId"
                          :dataFormId="Number(dataForm.id)"
                          :moRoutingOperationId="Number(moRoutingOperationId)"
                          @refreshTestStandardInfo="refreshTestStandardInfo"
                        ></testStandardTable>
                      </el-tab-pane>
@@ -853,7 +853,7 @@
                </el-row>
              </el-tab-pane>
              <el-tab-pane label="客户订单" id="ta3" key="ta3" name="ta3">
                <CustomerOrder :orderId="dataForm.id" />
                <CustomerOrder :orderId="Number(dataForm.id)" />
              </el-tab-pane>
            </el-tabs>
          </el-card>
@@ -917,8 +917,8 @@
    />
    <spotCheckRule
      :currshowlist.sync="spotCheckRuleShow"
      :moId="dataForm.id"
      :moRoutingOperationId="moRoutingOperationId"
      :moId="Number(dataForm.id)"
      :moRoutingOperationId="Number(moRoutingOperationId)"
      :moRoutingOperationName="moRoutingOperationName"
      @refreshSpotCheckRuleList="refreshSpotCheckRuleList"
    />
@@ -2109,7 +2109,7 @@
      } else {
        if (this.structSelection.length === 1) {
          this.selectedStruct = this.structSelection[0]
          this.moId = this.dataForm.id
          this.moId = Number(this.dataForm.id)
          this.showStructForm = true
        } else {
          this.$message.error('只能为单个节点添加元素')
@@ -2126,7 +2126,7 @@
    refreshSpotCheckRuleList() {
      this.spotCheckRuleList = []
      qryMoSamplingRule({
        moId: this.dataForm.id,
        moId: Number(this.dataForm.id),
        moRoutingOperationId: this.moRoutingOperationId
      }).then((response) => {
        const resData = response.data

 src/views/plan/outsourcingorder/index.vue

@@ -259,7 +259,7 @@
          {
            minWidth: '140',
            prop: 'foreignState',
            label: '对外直发状态',
            label: '外协直发状态',
            sort: true,
            isTrue: true,
            formatter: this.formatForeignState,
@@ -357,12 +357,12 @@
            loading: false,
            fun: this.launchOaProcess
          },
          {
            text: '新增外协直发申请单',
            type: 'primary',
            loading: false,
            fun: this.showForeign
          },
          // {
          //   text: '新增外协直发申请单',
          //   type: 'primary',
          //   loading: false,
          //   fun: this.showForeign
          // },
        ],
        operator:[
          {
@@ -376,23 +376,12 @@
              key: 'oaState'
            }
          },
          {
            text: '打印模具外协生产单',
            type: 'text',
            size: 'small',
            show: {
              val: [
                '03pass'
              ],
              key: 'oaState'
            }
          }
        ],
        operatorConfig: {
          fixed: 'right',
          label: '操作',
          width: 230,
          minWidth: 230
          width: 100,
          minWidth: 100
        }
      },
      foreignStateList: [
@@ -524,23 +513,23 @@
  },
  methods: {
    //展示新增外协直发模态框
    showForeign(){
      let data = this.currentOutsourcingOrder
      if(data){
        if(data.foreignState == "1"){
          this.$message.warning("该订单无需外协直发申请单")
          return
        }
        if(data.foreignState == "0" && data.foreignId!= null){
          this.$message.warning("该订单已有外协直发申请单")
          return
        }
        //
        this.$message.success("新增")
      }else{
        this.$message.warning("请选择一条委外订单")
      }
    },
    // showForeign(){
    //   let data = this.currentOutsourcingOrder
    //   if(data){
    //     if(data.foreignState == "1"){
    //       this.$message.warning("该订单无需外协直发申请单")
    //       return
    //     }
    //     if(data.foreignState == "0" && data.foreignId!= null){
    //       this.$message.warning("该订单已有外协直发申请单")
    //       return
    //     }
    //     //
    //     this.$message.success("新增")
    //   }else{
    //     this.$message.warning("请选择一条委外订单")
    //   }
    // },
    // 获取数据列表
    getData() {
      this.$refs.outsourcingOrderTable.refreshData()