Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS

zzq

2023-09-28 2b78cf0cd68e1809bc4cad7d730bef6ab9c4c118

 src/views/overview/AddOverviewDialog.vue

@@ -107,10 +107,9 @@
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="入库类型">
              <el-col v-if="showOperationType" :span="12">
                <el-form-item label="入库类型" prop="operationTypeId">
                  <el-select
                    v-if="showOperationType"
                    v-model="editConfig.infomation.operationTypeId"
                    placeholder="请选择"
                    size="mini"
@@ -120,7 +119,11 @@
                    <el-option v-for="item in operationTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                  <el-input v-else v-model="receiptType" disabled style="width: 90%"></el-input>
                </el-form-item>
              </el-col>
              <el-col v-else :span="12">
                <el-form-item label="入库类型">
                  <el-input v-model="receiptType" disabled style="width: 90%"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -317,7 +320,8 @@
        sourceNumber: [{ required: true, message: "请输入来源单据", trigger: "blur" }],
        operationDate: [{ required: true, message: "请选择日期", trigger: "change" }],
        toLocationId: [{ required: true, message: "请选择仓库位置", trigger: "change" }],
        fromLocationId: [{ required: true, message: "请选择源位置", trigger: "change" }]
        fromLocationId: [{ required: true, message: "请选择源位置", trigger: "change" }],
        operationTypeId: [{ required: true, message: "请选择入库类型", trigger: "change" }]
      },
      companyOptions: [], // 公司
      memberOptions: [{ id: 1, name: "管理员" }],
@@ -410,7 +414,7 @@
        this.showEdit = false
        this.showFooter = true
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === 4) {
      } else if (this.editConfig.infomation.status === 4||this.editConfig.infomation.status === "完成") {
        this.showButton = true
        this.showEdit = false
        this.isDelClick = true
@@ -422,6 +426,7 @@
        this.showFooter = false
        this.isValidateClick = false
      } else {
        // 就绪---
        this.showButton = true
        this.showEdit = true
        this.showFooter = false
@@ -431,7 +436,8 @@
        this.list[0].status = "active"
      } else {
        this.list.map((item) => {
          if (item.value === this.editConfig.infomation.status) {
          console.log(item,this.editConfig.infomation.status,"打印信息")
          if (item.value === this.editConfig.infomation.status||item.label===this.editConfig.infomation.status) {
            item.status = "active"
          } else {
            item.status = "todo"