haoxuan
2024-04-17 95ff77e1e2994fe1088c69b326bdd7023c8563dc
Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq
2个文件已修改
19 ■■■■■ 已修改文件
src/views/operate/inventoryAdjustment/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productManage/product/AddProductDialog.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/inventoryAdjustment/index.vue
@@ -209,7 +209,8 @@
    // 是否选择产品
    isSel() {
      for (let i = 0; i < this.tableData.length; i++) {
        if (this.tableData[i].productName?.length === 0) {
        // this.tableData[i].productName?.length === 0||!this.tableData[i].productId
        if (!this.tableData[i].productId||!this.tableData[i].isEdit) {
          this.isNoProduct = false
          break
        } else {
@@ -281,8 +282,9 @@
      this.locationId = row.locationId
      this.rowIndex = rowIndex
      this.isSel()
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")
      //!this.isNoProduct && this.currentRowId == 0
      if (!this.isNoProduct) {
        this.$message.error("请完成当前保存或取消保存!")
      } else {
        this.currentRowId = row.id
        this.addTitle = "保存"
@@ -326,7 +328,7 @@
          productId:this.productId
        }).then((res)=>{
          if(res&&res.code===200){
            this.tableData[0].amount=res.data.amount||0
            this.tableData[0].amount=res.data?res.data.amount:0
          }
        })
      }
src/views/productManage/product/AddProductDialog.vue
@@ -148,8 +148,9 @@
                      placeholder="单位"
                      filterable
                      @change="Gtechange"
                      style="width: calc(85% - 110px)"
                      style="width: calc(85% - 0px)"
                    >
                    <!-- style="width: calc(85% - 110px)" -->
                      <el-option
                        v-for="ele in unitList"
                        :key="ele.id"
@@ -162,14 +163,14 @@
                      style="font-size: 20px; color: gray"
                      @click="handleUnitShow"
                    ></i>
                    <el-checkbox
                    <!-- <el-checkbox
                    class="margin_left_10px"
                    :disabled="editConfig.infomation.unit&&showFooter?false:true"
                    v-model="editConfig.infomation.moreUnit"
                    @change="moreUnitChange"
                    ></el-checkbox
                  >
                  <span class="margin_left_10px cursor_pointer"  @click="handleUnitMore">启用多单位</span>
                  > -->
                  <!-- <span class="margin_left_10px cursor_pointer"  @click="handleUnitMore">启用多单位</span> -->
                  </el-form-item>
                  
                  <el-form-item label="产品标签" prop="productTagName">