Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/warehouseManage/bussinessType/AddBussinessType.vue

@@ -27,53 +27,60 @@
        ref="form"
        :model="editConfig.infomation"
        :rules="rules"
        label-position="left"
        label-width="110px"
        label-position="right"
        label-width="120px"
        size="mini"
      >
        <div class="basic-info">
          <!-- <FormBtnsView :showProduct="true" @productClick="productClick" /> -->
          <div class="basic-info-view">
            <div class="purchase-view">
              <div class="left" style="margin-left: 20px">
                <el-form-item label="入库类型" prop="name">
              <div class="left">
                <el-form-item label="单据类型" prop="name">
                  <el-input
                    v-model="editConfig.infomation.name"
                    placeholder="请填写"
                    :disabled="!showFooter"
                    style="width: 85%"
                    style="width: 100%"
                  ></el-input>
                </el-form-item>
                <el-form-item label="作业类型" prop="baseOperationType" :label-width="labelWidth">
                <el-form-item label="作业类型" prop="baseOperationType">
                  <el-select
                    v-model="editConfig.infomation.baseOperationType"
                    placeholder="请选择"
                    size="mini"
                    style="width: 85%"
                    style="width: 100%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in baseOperationTypeList" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>

                <el-form-item label="序号前缀" prop="prefix" :label-width="labelWidth">
                  <el-input
                    v-model="editConfig.infomation.prefix"
                    placeholder=""
                    :disabled="!showFooter"
                    style="width: 85%"
                  ></el-input>
                </el-form-item>
                <el-form-item label="仓库" prop="warehouseId" :label-width="labelWidth">
                <el-form-item label="默认源位置" prop="defaultLocationSrcId">
                  <el-select
                    v-model="editConfig.infomation.warehouseId"
                    v-model="editConfig.infomation.defaultLocationSrcId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 85%"
                    style="width: 100%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id">
                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
                <el-form-item
                  v-if="editConfig.infomation.baseOperationType !== 1"
                  label="默认目的位置"
                  prop="defaultLocationDestId"
                >
                  <el-select
                    v-model="editConfig.infomation.defaultLocationDestId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -92,13 +99,63 @@
                </el-form-item> -->
              </div>
              <div class="right">
                <el-form-item label="退货类型" prop="returnOperationTypeID">
                <el-form-item label="序号前缀" prop="prefix">
                  <el-input
                    v-model="editConfig.infomation.prefix"
                    placeholder=""
                    :disabled="!showFooter"
                    style="width: 100%"
                  ></el-input>
                </el-form-item>
                <el-form-item
                  v-if="editConfig.infomation.baseOperationType !== 1"
                  label="保留方式"
                  prop="reservationMethod"
                >
                  <el-radio-group v-model="editConfig.infomation.reservationMethod" :disabled="!showFooter">
                    <el-radio v-for="item in reservationMethodList" :key="item.id" :value="item.id" :label="item.id"
                      >{{ item.name }}
                    </el-radio>
                  </el-radio-group>
                </el-form-item>
                <el-form-item label="仓库" prop="warehouseId">
                  <el-select
                    v-model="editConfig.infomation.returnOperationTypeID"
                    v-if="editConfig.infomation.baseOperationType"
                    v-model="editConfig.infomation.warehouseId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 85%"
                    style="width: 100%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
                <el-form-item
                  v-if="editConfig.infomation.baseOperationType === 1"
                  label="默认目的位置"
                  prop="defaultLocationDestId"
                >
                  <el-select
                    v-model="editConfig.infomation.defaultLocationDestId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
                <!-- <el-form-item
                  v-if="editConfig.infomation.baseOperationType"
                  label="退货类型"
                  prop="returnOperationTypeID"
                >
                  <el-select
                    v-model="editConfig.infomation.returnOperationTypeID"
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="!showFooter"
                  >
                    <el-option
@@ -115,7 +172,7 @@
                    v-model="editConfig.infomation.createBackorder"
                    placeholder="请选择"
                    size="mini"
                    style="width: 85%"
                    style="width: 100%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in createBackorderList" :key="item.id" :label="item.name" :value="item.id">
@@ -123,70 +180,15 @@
                  </el-select>
                </el-form-item>
                <el-form-item label="显示作业详情" prop="showOperations">
                  <el-checkbox v-model="editConfig.infomation.showOperations"></el-checkbox>
                  <el-checkbox v-model="editConfig.infomation.showOperations" :disabled="!showFooter"></el-checkbox>
                </el-form-item>
                <el-form-item
                  v-if="editConfig.infomation.baseOperationType === 1"
                  label="预填写作业详情"
                  prop="earlyOperations"
                >
                  <el-checkbox v-model="editConfig.infomation.earlyOperations"></el-checkbox>
                </el-form-item>
                <el-form-item
                  v-if="editConfig.infomation.baseOperationType !== 1"
                  label="保留方式"
                  prop="reservationMethod"
                  :label-width="labelWidth"
                >
                  <el-radio-group
                    v-model="editConfig.infomation.reservationMethod"
                    @input="reserveMethodClick"
                    :disabled="!showFooter"
                  >
                    <div style="margin-top: 8px">
                      <el-radio
                        v-for="item in reservationMethodList"
                        :key="item.id"
                        :value="item.id"
                        :label="item.name"
                      >
                      </el-radio>
                    </div>
                  </el-radio-group>
                </el-form-item>
              </div>
            </div>
          </div>
          <div class="bottom">
            <div class="purchase-view">
              <div class="left">
                <!-- <div class="second-label">位置</div> -->
                <el-form-item label="默认源位置" prop="defaultLocationSrcId" style="margin-left: 20px">
                  <el-select
                    v-model="editConfig.infomation.defaultLocationSrcId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 85%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </div>
              <div class="right">
                <el-form-item label="默认目的位置" prop="defaultLocationDestId" style="margin-left: 20px">
                  <el-select
                    v-model="editConfig.infomation.defaultLocationDestId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 85%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
                  <el-checkbox v-model="editConfig.infomation.earlyOperations" :disabled="!showFooter"></el-checkbox>
                </el-form-item> -->
              </div>
            </div>
          </div>
@@ -194,7 +196,6 @@
      </el-form>
      <!-- 尾 -->
      <div slot="footer" class="dialog-footer">
        <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">保并提交审批</el-button> -->
        <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">保存</el-button>
        <el-button size="small" @click="editConfig.visible = false">取消</el-button>
      </div>
@@ -232,7 +233,7 @@
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        // 入库类型
        // 业务类型
        name: [{ required: true, message: "请输入", trigger: "change" }],
        // 前缀
        prefix: [{ required: true, message: "请输入", trigger: "change" }],
@@ -279,8 +280,8 @@
        page: 0,
        pageSize: 0
      }).then((res) => {
        if (res.data.code == 200) {
          this.warehouseList = res.data.data ? res.data.data : []
        if (res.code == 200) {
          this.warehouseList = res.data ? res.data : []
        }
      })
    },
@@ -291,6 +292,9 @@
    setBottonView() {
      if (this.editConfig.title === "新建") {
        this.showButton = false
        this.showEdit = false
        this.showFooter = true
      } else if (this.editConfig.title === "编辑") {
        this.showEdit = false
        this.showFooter = true
      } else {
@@ -325,7 +329,7 @@
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation))

      let params = {
        // 入库类型
        // 业务类型
        name: data.name,
        // 前缀
        prefix: data.prefix,
@@ -338,10 +342,10 @@
        // 仓库
        warehouseId: data.warehouseId,
        // 显示作业详情
        showOperations: data.showOperations,
        showOperations: data.showOperations ? data.showOperations : false,
        earlyOperations: data.earlyOperations,
        // 保留方式
        reservationMethod: data.reservationMethod,
        reservationMethod: data.reservationMethod ? data.reservationMethod : 0,
        // 默认原位置
        defaultLocationSrcId: data.defaultLocationSrcId,
        // 默认目标位置
@@ -389,15 +393,15 @@
    // 产品
    productClick() {
      this.$router.push({ path: "/productManage/productList", query: { name: "产品" } })
    },
    // 保留方式
    reserveMethodClick(val) {
      if (val === "在预定日期之前") {
        this.labelWidth = "140px"
      } else {
        this.labelWidth = "80px"
      }
    }
    // 保留方式
    // reserveMethodClick(val) {
    // if (val === "在预定日期之前") {
    //   this.labelWidth = "140px"
    // } else {
    //   this.labelWidth = "80px"
    // }
    // }
  }
}
</script>
@@ -424,9 +428,11 @@
  border-bottom: 1px solid #e9e9e9;
}
.basic-info {
  height: calc(100% - 80px);
  overflow: auto;
  margin: 20px;
  // height: 350px;
  // overflow-y: auto;
  // overflow-x: hidden;
  width: calc(100% - 60px);
  margin: 30px;
  // border: 1px solid #dcdfe6;
  // box-shadow: inset 0 0 2px #dee2e6;
  // -moz-box-shadow: inset 0 0 2px #dee2e6;