Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-18 d54db34a27eedb50c7290aad79d9ec75590a68fa

Merge branch 'dev' into songshankun/adjust-style

 src/views/warehouseManage/bussinessType/AddBussinessType.vue

@@ -36,7 +36,7 @@
          <div class="basic-info-view">
            <div class="purchase-view">
              <div class="left">
                <el-form-item label="入库类型" prop="name">
                <el-form-item label="业务类型" prop="name">
                  <el-input
                    v-model="editConfig.infomation.name"
                    placeholder="请填写"
@@ -56,30 +56,25 @@
                    </el-option>
                  </el-select>
                </el-form-item>

                <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 label="仓库" prop="warehouseId">
                <el-form-item label="默认源位置" prop="defaultLocationSrcId">
                  <el-select
                    v-model="editConfig.infomation.warehouseId"
                    v-model="editConfig.infomation.defaultLocationSrcId"
                    placeholder="请选择"
                    size="mini"
                    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 label="默认源位置" prop="defaultLocationSrcId">
                <el-form-item
                  v-if="editConfig.infomation.baseOperationType !== 1"
                  label="默认目的位置"
                  prop="defaultLocationDestId"
                >
                  <el-select
                    v-model="editConfig.infomation.defaultLocationSrcId"
                    v-model="editConfig.infomation.defaultLocationDestId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
@@ -104,7 +99,54 @@
                </el-form-item> -->
              </div>
              <div class="right">
                <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.warehouseId"
                    placeholder="请选择"
                    size="mini"
                    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"
@@ -146,32 +188,7 @@
                  prop="earlyOperations"
                >
                  <el-checkbox v-model="editConfig.infomation.earlyOperations" :disabled="!showFooter"></el-checkbox>
                </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">
                    <!-- <div style="margin-top: 8px"> -->
                    <el-radio v-for="item in reservationMethodList" :key="item.id" :value="item.id" :label="item.id"
                      >{{ item.name }}
                    </el-radio>
                    <!-- </div> -->
                  </el-radio-group>
                </el-form-item>
                <el-form-item 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> -->
              </div>
            </div>
          </div>
@@ -179,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>
@@ -217,7 +233,7 @@
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        // 入库类型
        // 业务类型
        name: [{ required: true, message: "请输入", trigger: "change" }],
        // 前缀
        prefix: [{ required: true, message: "请输入", trigger: "change" }],
@@ -310,7 +326,7 @@
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation))

      let params = {
        // 入库类型
        // 业务类型
        name: data.name,
        // 前缀
        prefix: data.prefix,

 src/views/warehouseManage/bussinessType/index.vue

@@ -3,7 +3,7 @@
    <div class="top">
      <SearchCommonView
        :add-title="'新建'"
        :placeholder="'请输入入库类型'"
        :placeholder="'请输入业务类型'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
@@ -77,7 +77,7 @@
      console.log(showcol)
      let tableColumn = [
        {
          label: "入库类型",
          label: "业务类型",
          prop: "name",
          isShowColumn: true,
          default: true