modified: src/views/product/workbench/feed-form.vue modified: src/vie...

zss

2023-11-28 e969c1f0523c69fe854fdcad7d8d8e2da6dcf30d

	modified:   src/views/product/workbench/feed-form.vue
	modified:   src/views/product/workbench/feed-pane.vue
	modified:   src/views/warehouse/pallettransports/index.vue
	modified:   vue.config.js

 src/views/product/workbench/feed-form.vue

@@ -29,10 +29,10 @@
          >
          </el-table-column>
          <el-table-column
            prop="partDescription"
            prop="partName"
            header-align="center"
            align="center"
            label="零件描述"
            label="零件"
          >
          </el-table-column>
          <el-table-column
@@ -205,13 +205,13 @@
      getCheckRawPart(partNoList).then((response) => {
        if (response.data.code === 0) {
          // 需要密码确认情况
          if (response.data.data.success === false) {
            this.messages = response.data.data.message
            this.onnerVisible = true
          } else {
          //if (response.data.data.success === false) {
          //  this.messages = response.data.data.message
          //  this.onnerVisible = true
          //} else {
            // 不需要密码 直接投料
            this.saveFeed()
          }
          //}
        }
      })
    },

 src/views/product/workbench/feed-pane.vue

@@ -229,16 +229,16 @@
            </template>
          </el-table-column> -->
          <el-table-column
            label="零件描述"
            prop="partDescription"
            label="零件"
            prop="partName"
            align="center" show-overflow-tooltip
          >
            <template slot="header">
              <div style="line-height: 14px;">零件描述</div>
              <div style="line-height: 14px;">零件</div>
              <div class="th" @click.stop>
                <el-input
                  type="text"
                  v-model="queryParamTwo.partDescription"
                  v-model="queryParamTwo.partName"
                  @keyup.enter.native="handleStockList"
                  clearable
                  @clear="handleStockList"
@@ -247,7 +247,7 @@
              </div>
            </template>
            <template slot-scope="scope">
              <span>{{ scope.row.partDescription }}</span>
              <span>{{ scope.row.partName }}</span>
            </template>
          </el-table-column>
          <el-table-column label="IFS批次号" prop="ifsBatchNo" align="center">
@@ -1202,7 +1202,7 @@
        :show-overflow-tooltip="true"
      >
        <template slot="header" slot-scope="scope">
          <div style="line-height: 14px;">零件描述</div>
          <div style="line-height: 14px;">零件</div>
          <div class="th" @click.stop>
            <el-input
              type="text"

 src/views/warehouse/pallettransports/index.vue

@@ -215,6 +215,7 @@
        url: ''
      },
      WorkOrder:{},
      datalistAPI:'',
      prelang: 'pallettransports',
      options: {
        height: 300, // 默认高度-为了表头固定
@@ -576,6 +577,7 @@
              } else {
                this.$message.error('添加移库明细失败')
              }
              this.palletTransportsMaterialSelectionChange()
            })
            .catch(() => {
            })
@@ -704,27 +706,25 @@
    },
    palletTransportsMaterialSelectionChange(val) {
      this.palletTransportsMaterialMultipleSelection = val
      let nn =[]
      this.palletTransportsMaterialMultipleSelection.forEach(el =>{nn.push(el.id)})
      let xx = nn[nn.length - 1];
      console.log(xx);
      console.log(this.currPalletTransportsRow.id,"默认");
      this.palletTransportsDetailData = []
      if (xx) {
        selectAll({transportsId:this.currPalletTransportsRow.id,transportsMaterialId:xx}).then((res) =>{
        console.log(res.data.data);
        this.palletTransportsDetailData.push(res.data.data)})
      }
      // if (this.palletTransportsMaterialMultipleSelection.length > 0) {
      //   const currPalletTransportsMaterial = this
      //     .palletTransportsMaterialMultipleSelection[
      //     this.palletTransportsMaterialMultipleSelection.length - 1
      //   ]
      //   this.materialRow = currPalletTransportsMaterial
      // } else {
      //   this.materialRow = null
      // }
      // this.getPalletTransportsDetailData()
      let ids =[]
      this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
      let pId = ids.length>0 ? [ids.length - 1] : null;
      console.log(pId);
      if(pId!=null){
        selectAll({
            transportsId:this.currPalletTransportsRow.id,
            transportsMaterialId: pId
          }).then((res) =>{
            console.log(res);
            if(res.status===200 && res.data.data!=null){
              this.palletTransportsDetailData.push(res.data.data)
            }else{
              this.palletTransportsDetailData = []
            }
            })
         }else{
          this.palletTransportsDetailData = []
         }
    },
    palletTransportsDetailSelectionChange(val) {
      this.palletTransportsDetailMultipleSelection = val

 vue.config.js

@@ -2,12 +2,12 @@
 * 配置参考:
 * https://cli.vuejs.org/zh/config/
 */
const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
// const url = 'http://192.168.83.249:9999'

// const url = 'http://localhost:9999'
 const url = 'http://localhost:9999'

// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'