Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/warehouseManage/position/AddDialog.vue

@@ -19,7 +19,7 @@
            <span>动作</span>
            <!-- <el-button plain size="mini" style="margin-left: 15px" @click="deleteClick">删除</el-button> -->
          </span>
          <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">编辑</el-button>
          <el-button v-if="showEdit&&editConfig.infomation.type==3" plain size="mini" style="margin-left: 15px" @click="editClick">编辑</el-button>
        </div>
      </div>
      <!-- 内容 -->
@@ -53,10 +53,10 @@
                    v-model="editConfig.infomation.parentId"
                    placeholder="请选择"
                    size="mini"
                    :disabled="!showFooter"
                    :disabled="editCommonConfig.title!='新建'"
                    style="width: 90%"
                  >
                    <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
                    <el-option v-for="item in positionList" :key="item.id" :label="item.jointName" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -68,7 +68,7 @@
                  <el-select
                    v-model="editConfig.infomation.type"
                    filterable
                    :disabled="!showFooter"
                    :disabled="editCommonConfig.title!='新建'"
                    placeholder="请选择"
                    style="width: 90%"
                    no-data-text="暂无数据"
@@ -202,6 +202,8 @@
      editConfig: this.editCommonConfig,
      rules: {
        name: [{ required: true, message: "请输入", trigger: "change" }],
        parentId: [{ required: true, message: "请选择位置类型", trigger: "change" }],
        type: [{ required: true, message: "请选择上级位置", trigger: "change" }],
        countFrequency: [
          {
            required: false,
@@ -243,7 +245,7 @@
    productClick() {},
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title === "新建"||this.editConfig.title === "编辑") {
        this.showEdit = false
        this.showFooter = true
      } else if (this.editConfig.infomation.status === "完成") {
@@ -292,7 +294,8 @@
        notes: data.notes
      }
      if (data.id) {
        params.id = data.id
        params.id = data.id;
        params.jointName=data.jointName;
      }
      return params
    },