Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-23 ba2a88b235360c8bea43f1c3adc90df84f437576

 web_standard/src/components/ext/OperaWInboundExtWindow.vue

@@ -101,6 +101,18 @@
          </el-select>
        </template>
      </el-table-column>
       <el-table-column  v-if="winType==2" label="工序" min-width="100px">
              <template slot-scope="{row}">
                <el-select v-model="row.procedureId" filterable placeholder="请选择" @select="selectProcedure">
                  <el-option
                    v-for="(item, index) in row.procedureList"
                    :key="index"
                    :label="item.name"
                    :value="item.id">
                  </el-option>
                </el-select>
              </template>
            </el-table-column>
      <el-table-column label="批次号" min-width="100px">
        <template slot-scope="{row}">
          <el-input v-model="row.batch" placeholder="请输入批次号" v-trim/>
@@ -154,6 +166,7 @@
        origin: 0,
        woutboundInBodyBeanList: []
      },
      winType:0,
      disabled: false,
      pickerOptions: {},
      tempWarehouses: [],
@@ -220,6 +233,7 @@
    open (title, type = 0) {
      this.title = title
      this.visible = true
      this.winType=type
      // 新建
      this.$nextTick(() => {
        this.$refs.form.resetFields()
@@ -369,7 +383,7 @@
    addMaterial () {
      // console.log('增加物料')
      // const ids = this.form.woutboundInBodyBeanList.map(e => { return e.materialId }).join(',')
      this.$refs.selectMaterail.open('选择物料', { ids: '', multiple: true, isPurchase:true })
      this.$refs.selectMaterail.open('选择物料', { ids: '', multiple: true, isPurchase:false,queryType:1 })
    },
    deleteMaterail (row) {
      // console.log('删除物料')
@@ -383,7 +397,8 @@
          code: item.mmodelCode,
          name: item.mmodelUnionName,
          umodelName: item.umodelName,
          
          procedureList:item.procedureList,
          procedureId:null,
          locationId: this.whLocation.length ? this.whLocation[0].id : null,
          qualityType: this.whLocation.length ? 0 : this.houseProperty,
          materialId: item.id,