yangfeng
2023-10-17 f9536da2d1e3add6037ffbbcbce571c16df67045
产品模块、仓库管理模块全部新建弹窗样式修改
8个文件已修改
688 ■■■■ 已修改文件
src/components/makepager/FormBtnsView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/scrap/AddScrapDialog.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/AddOverviewDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productManage/product/AddProductDialog.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productManage/productCategory/AddProductCategoryDialog.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouseManage/bussinessType/AddBussinessType.vue 220 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouseManage/position/AddDialog.vue 182 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouseManage/warehouse/AddDialog.vue 251 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/makepager/FormBtnsView.vue
@@ -142,7 +142,7 @@
<style lang="scss" scoped>
.content-number {
  display: flex;
  // justify-content: left;
  justify-content: right;
  height: 44px;
  // border-bottom: 1px solid #e9e9e9;
  padding: 0px 10px;
src/views/operate/scrap/AddScrapDialog.vue
@@ -29,7 +29,6 @@
        label-position="right"
        label-width="120px"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
        <div>
          <!-- <div>aaa</div> -->
@@ -121,9 +120,9 @@
        </div>
      </el-form>
      <!-- 尾 -->
      <div v-if="showFooter" slot="footer" class="dialog-footer">
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">保存</el-button>
        <el-button size="small" @click="editConfig.visible = false">取消</el-button>
        <el-button type="primary" size="small" @click="saveClick('form')">保存</el-button>
      </div>
    </el-dialog>
  </div>
@@ -313,13 +312,13 @@
  height: calc(100% - 80px);
  overflow: auto;
  margin: 20px;
  border: 1px solid #dcdfe6;
  box-shadow: inset 0 0 2px #dee2e6;
  -moz-box-shadow: inset 0 0 2px #dee2e6;
  -webkit-box-shadow: inset 0 0 2px #dee2e6;
  .basic-info-view {
    margin-top: 20px;
  }
  // border: 1px solid #dcdfe6;
  // box-shadow: inset 0 0 2px #dee2e6;
  // -moz-box-shadow: inset 0 0 2px #dee2e6;
  // -webkit-box-shadow: inset 0 0 2px #dee2e6;
  // .basic-info-view {
  //   margin-top: 20px;
  // }
}
.purchase-view {
  display: flex;
src/views/overview/AddOverviewDialog.vue
@@ -263,9 +263,9 @@
        </div>
      </el-form>
      <!-- 尾 -->
      <div v-if="showFooter" slot="footer" class="dialog-footer">
      <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')">保存</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>
    </el-dialog>
src/views/productManage/product/AddProductDialog.vue
@@ -29,7 +29,6 @@
        label-position="right"
        label-width="110px"
        size="mini"
        style="height: 53vh; overflow-x: hidden"
      >
        <!-- <div class="content-btn">
          <el-button plain size="mini" disabled>标签打印</el-button>
@@ -450,8 +449,8 @@
        </div>
      </el-form>
      <!-- 尾 -->
      <div v-if="showFooter" slot="footer" class="dialog-footer">
        <el-button type="primary" size="small" @click="saveClick('form')">保存</el-button>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">保存</el-button>
        <el-button size="small" @click="editConfig.visible = false">取消</el-button>
      </div>
    </el-dialog>
src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -36,7 +36,6 @@
        label-position="right"
        label-width="110px"
        size="mini"
        style="height: 290px; overflow-x: hidden"
      >
        <div class="basic-info">
          <FormBtnsView :showProduct="true" @productClick="productClick" />
@@ -161,9 +160,9 @@
        </div>
      </el-form>
      <!-- 尾 -->
      <div v-if="showFooter" slot="footer" class="dialog-footer">
      <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')">保存</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>
    </el-dialog>
src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -30,15 +30,13 @@
        label-position="left"
        label-width="110px"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
        <div class="basic-info">
          <!-- <FormBtnsView :showProduct="true" @productClick="productClick" /> -->
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <div style="margin-left: 20px">入库类型</div>
                <el-form-item label="" prop="name" label-width="20px">
            <div class="purchase-view">
              <div class="left" style="margin-left: 20px">
                <el-form-item label="入库类型" prop="name">
                  <el-input
                    v-model="editConfig.infomation.name"
                    placeholder="请填写"
@@ -46,10 +44,6 @@
                    style="width: 85%"
                  ></el-input>
                </el-form-item>
              </el-col>
            </el-row>
            <div class="purchase-view">
              <div class="left" style="margin-left: 20px">
                <el-form-item label="作业类型" prop="baseOperationType" :label-width="labelWidth">
                  <el-select
                    v-model="editConfig.infomation.baseOperationType"
@@ -58,10 +52,11 @@
                    style="width: 85%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in baseOperationTypeList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
                    <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"
@@ -82,27 +77,6 @@
                    </el-option>
                  </el-select>
                </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>
                <!-- <el-form-item
                  v-if="editConfig.infomation.resource == '在预定日期之前'"
                  label="在预定日期前预定"
@@ -118,7 +92,6 @@
                </el-form-item> -->
              </div>
              <div class="right">
                <el-form-item label="退货类型" prop="returnOperationTypeID">
                  <el-select
                    v-model="editConfig.infomation.returnOperationTypeID"
@@ -128,7 +101,12 @@
                    style="width: 85%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in returnOperationTypeList" :key="item.id" :label="item.username" :value="item.id">
                    <el-option
                      v-for="item in returnOperationTypeList"
                      :key="item.id"
                      :label="item.username"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -154,16 +132,35 @@
                >
                  <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>
            <!-- <el-col :span="24">
              </el-col> -->
          </div>
          <div class="bottom">
            <div class="purchase-view">
              <div class="left">
                <div class="second-label">位置</div>
                <!-- <div class="second-label">位置</div> -->
                <el-form-item label="默认源位置" prop="defaultLocationSrcId" style="margin-left: 20px">
                  <el-select
                    v-model="editConfig.infomation.defaultLocationSrcId"
@@ -176,6 +173,8 @@
                    </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"
@@ -189,15 +188,14 @@
                  </el-select>
                </el-form-item>
              </div>
              <div class="right"></div>
            </div>
          </div>
        </div>
      </el-form>
      <!-- 尾 -->
      <div v-if="showFooter" slot="footer" class="dialog-footer">
      <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')">保存</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>
    </el-dialog>
@@ -205,8 +203,14 @@
</template>
<script>
import { addOperationType,updateOperationType,getWarehouseList,deleteOperationType,getLocationList} from "@/api/warehouseManage/warehouse"
import { getDataByType } from "@/api/data";
import {
  addOperationType,
  updateOperationType,
  getWarehouseList,
  deleteOperationType,
  getLocationList
} from "@/api/warehouseManage/warehouse"
import { getDataByType } from "@/api/data"
export default {
  name: "AddBussinessType",
  props: {
@@ -232,25 +236,25 @@
        name: [{ required: true, message: "请输入", trigger: "change" }],
        // 前缀
        prefix: [{ required: true, message: "请输入", trigger: "change" }],
        baseOperationType: [{ required: true, message: "请选择", trigger: "change" }],
        baseOperationType: [{ required: true, message: "请选择", trigger: "change" }]
      },
      // 位置
      locationList: [],
      warehouseList:[],
      warehouseList: [],
      // 退货类型
      returnOperationTypeList:[],
      returnOperationTypeList: [],
      // 作业类型
      baseOperationTypeList:getDataByType('baseOperationType'),
      baseOperationTypeList: getDataByType("baseOperationType"),
      // 创建欠单
      createBackorderList:getDataByType('createBackorder'),
      createBackorderList: getDataByType("createBackorder"),
      // 保留方式
      reservationMethodList:getDataByType('reservationMethod'),
      reservationMethodList: getDataByType("reservationMethod"),
      showButton: true,
      showEdit: false, // 是否显示编辑按钮
      isDelClick: false, // 删除按钮是否可点击
      showFooter: false, // 是否显示取消保存
      labelWidth: "90px",
      positionlist:[],
      positionlist: []
    }
  },
  created() {
@@ -261,26 +265,26 @@
    // 仓库
    async getWarehouse() {
      await getLocationList({
        keyword:'',
        keyword: "",
        page: 0,
        pageSize: 0
      }).then((res) => {
        if (res.code === 200) {
          this.positionlist = res.data?res.data:[]
          this.positionlist = res.data ? res.data : []
          this.$forceUpdate()
        }
      })
      await getWarehouseList({
        keyword: '',
        keyword: "",
        page: 0,
        pageSize: 0
      }).then((res) => {
        if (res.data.code == 200) {
          this.warehouseList = res.data.data?res.data.data:[]
          this.warehouseList = res.data.data ? res.data.data : []
        }
      })
    },
    getList(){
    getList() {
      this.getWarehouse()
    },
    // 设置删除/打印/编辑是否显示
@@ -300,16 +304,16 @@
    },
    // 刪除
    deleteClick() {
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation));
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
      deleteOperationType({ id: data.id }).then((res) => {
        if (res.code === 200) {
          this.editConfig.visible = false;
          this.$message.success("刪除成功!");
          this.$emit("refresh");
          this.editConfig.visible = false
          this.$message.success("刪除成功!")
          this.$emit("refresh")
        } else {
            this.$message.warning(res.msg?res.msg:"删除失败!")
         }
      });
          this.$message.warning(res.msg ? res.msg : "删除失败!")
        }
      })
    },
    // 编辑
    editClick() {
@@ -318,67 +322,67 @@
      this.showFooter = true
    },
    saveParams() {
      let data =JSON.parse(JSON.stringify(this.editConfig.infomation));
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
      let params = {
        // 入库类型
        name:data.name,
        name: data.name,
        // 前缀
        prefix:data.prefix,
        prefix: data.prefix,
        // 作业类型
        baseOperationType:data.baseOperationType,
        baseOperationType: data.baseOperationType,
        // 退货类型
        returnOperationTypeID:data.returnOperationTypeID,
        returnOperationTypeID: data.returnOperationTypeID,
        // 创建欠单
        createBackorder:data.createBackorder,
        createBackorder: data.createBackorder,
        // 仓库
        warehouseId:data.warehouseId,
        warehouseId: data.warehouseId,
        // 显示作业详情
        showOperations:data.showOperations,
        earlyOperations:data.earlyOperations,
        showOperations: data.showOperations,
        earlyOperations: data.earlyOperations,
        // 保留方式
        reservationMethod:data.reservationMethod,
        reservationMethod: data.reservationMethod,
        // 默认原位置
        defaultLocationSrcId:data.defaultLocationSrcId,
        defaultLocationSrcId: data.defaultLocationSrcId,
        // 默认目标位置
        defaultLocationDestId:data.defaultLocationDestId,
        defaultLocationDestId: data.defaultLocationDestId
      }
      if(data.id){
        params.id=data.id
      if (data.id) {
        params.id = data.id
      }
      return params;
      return params
    },
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          const params = this.saveParams();
            if (this.editConfig.title === "新建") {
              addOperationType(params).then((res) => {
                if (res.code === 200) {
                  this.editConfig.visible = false;
                  this.$message.success("添加成功!");
                  this.$emit('refresh')
                } else {
                    this.$message.warning(res.msg?res.msg:"添加失败!")
                }
              });
            } else {
              updateOperationType(params).then((res) => {
                if (res.code === 200) {
                  this.editConfig.visible = false;
                  this.$message.success("编辑成功!");
                  this.$emit('refresh')
                } else {
                    this.$message.warning(res.msg?res.msg:"编辑失败!")
                }
              });
            }
        }else {
          console.log("error submit");
          return false;
          const params = this.saveParams()
          if (this.editConfig.title === "新建") {
            addOperationType(params).then((res) => {
              if (res.code === 200) {
                this.editConfig.visible = false
                this.$message.success("添加成功!")
                this.$emit("refresh")
              } else {
                this.$message.warning(res.msg ? res.msg : "添加失败!")
              }
            })
          } else {
            updateOperationType(params).then((res) => {
              if (res.code === 200) {
                this.editConfig.visible = false
                this.$message.success("编辑成功!")
                this.$emit("refresh")
              } else {
                this.$message.warning(res.msg ? res.msg : "编辑失败!")
              }
            })
          }
        } else {
          console.log("error submit")
          return false
        }
      });
      })
    },
    // 删除
    delClick() {},
@@ -423,10 +427,10 @@
  height: calc(100% - 80px);
  overflow: auto;
  margin: 20px;
  border: 1px solid #dcdfe6;
  box-shadow: inset 0 0 2px #dee2e6;
  -moz-box-shadow: inset 0 0 2px #dee2e6;
  -webkit-box-shadow: inset 0 0 2px #dee2e6;
  // border: 1px solid #dcdfe6;
  // box-shadow: inset 0 0 2px #dee2e6;
  // -moz-box-shadow: inset 0 0 2px #dee2e6;
  // -webkit-box-shadow: inset 0 0 2px #dee2e6;
  .content-number {
    display: flex;
    justify-content: right;
src/views/warehouseManage/position/AddDialog.vue
@@ -27,35 +27,34 @@
        ref="form"
        :model="editConfig.infomation"
        :rules="rules"
        label-position="left"
        label-width="110px"
        label-position="right"
        label-width="130px"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
        <div>
          <!-- <div>aaa</div> -->
        <div class="content-number-bg">
          <FormBtnsView :showPosition="true" :showWarehouse="false" @productClick="productClick" />
        </div>
        <div class="basic-info">
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24" class="line_height_30px">
              <el-col :span="12" class="line_height_30px">
                <el-form-item label="位置名称" prop="name">
                  <el-input
                    :disabled="!showFooter"
                    v-model="editConfig.infomation.name"
                    placeholder="请输入"
                    style="width: 90%"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="24">
              <el-col :span="12">
                <el-form-item label="上级位置" prop="parentId">
                  <el-select
                    v-model="editConfig.infomation.parentId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 45%"
                    :disabled="!showFooter"
                    style="width: 90%"
                  >
                    <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
@@ -63,79 +62,83 @@
                </el-form-item>
              </el-col>
            </el-row>
          </div>
          <div class="bottom">
            <div class="left">
              <div class="second-label">其他信息</div>
              <el-form-item label="位置类型" prop="type">
                <el-select
                  v-model="editConfig.infomation.type"
                  filterable
                  :disabled="!showFooter"
                  placeholder="请选择"
                  style="width: 100%"
                  no-data-text="暂无数据"
            <div class="purchase-view">
              <div class="left">
                <el-form-item label="位置类型" prop="type">
                  <el-select
                    v-model="editConfig.infomation.type"
                    filterable
                    :disabled="!showFooter"
                    placeholder="请选择"
                    style="width: 90%"
                    no-data-text="暂无数据"
                  >
                    <el-option v-for="item in positionTypeList" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
                <el-form-item
                  label="是一个报废位置"
                  v-if="editConfig.infomation.type == 3 || editConfig.infomation.type == 5"
                  prop="isScrapLocation"
                >
                  <el-option v-for="item in positionTypeList" :key="item.id" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>
              </el-form-item>
              <el-form-item
                label="是一个报废位置"
                v-if="editConfig.infomation.type == 3 || editConfig.infomation.type == 5"
                prop="isScrapLocation"
              >
                <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.isScrapLocation"> </el-checkbox>
              </el-form-item>
              <el-form-item label="是一个退回位置" prop="isReturnLocation">
                <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.isReturnLocation"> </el-checkbox>
              </el-form-item>
              <el-form-item label="补充位置" v-if="editConfig.infomation.type == 3" prop="replenishLocation">
                <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.replenishLocation"> </el-checkbox>
              </el-form-item>
                  <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.isScrapLocation"> </el-checkbox>
                </el-form-item>
                <el-form-item label="是一个退回位置" prop="isReturnLocation">
                  <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.isReturnLocation"> </el-checkbox>
                </el-form-item>
                <el-form-item label="补充位置" v-if="editConfig.infomation.type == 3" prop="replenishLocation">
                  <el-checkbox :disabled="!showFooter" v-model="editConfig.infomation.replenishLocation"> </el-checkbox>
                </el-form-item>
              </div>
              <div class="right" v-if="editConfig.infomation.type == 3 || editConfig.infomation.type == 7">
                <!-- <div class="second-label">循环计数</div> -->
                <el-form-item label="盘点频率(天)" prop="countFrequency">
                  <el-input
                    :disabled="!showFooter"
                    v-model="editConfig.infomation.countFrequency"
                    placeholder="请输入"
                    style="width: 90%"
                  ></el-input>
                </el-form-item>
                <el-form-item label="最近有效盘点" prop="recentlyCount">
                  <el-date-picker
                    :disabled="!showFooter"
                    v-model="editConfig.infomation.recentlyCount"
                    type="date"
                    placeholder="选择日期"
                    value-format="yyyy-MM-dd"
                    style="width: 90%"
                  >
                  </el-date-picker>
                </el-form-item>
                <el-form-item label="预计下一次盘点" prop="nextCount">
                  <el-date-picker
                    :disabled="!showFooter"
                    v-model="editConfig.infomation.nextCount"
                    type="date"
                    placeholder="选择日期"
                    value-format="yyyy-MM-dd"
                    style="width: 90%"
                  >
                  </el-date-picker>
                </el-form-item>
              </div>
            </div>
            <div class="left" v-if="editConfig.infomation.type == 3 || editConfig.infomation.type == 7">
              <div class="second-label">循环计数</div>
              <el-form-item label="盘点频率(天)" prop="countFrequency">
                <el-input
                  :disabled="!showFooter"
                  v-model="editConfig.infomation.countFrequency"
                  placeholder="请输入"
                ></el-input>
              </el-form-item>
              <el-form-item label="最近有效盘点" prop="recentlyCount">
                <el-date-picker
                  :disabled="!showFooter"
                  v-model="editConfig.infomation.recentlyCount"
                  type="date"
                  placeholder="选择日期"
                  value-format="yyyy-MM-dd"
                >
                </el-date-picker>
              </el-form-item>
              <el-form-item label="预计下一次盘点" prop="nextCount">
                <el-date-picker
                  :disabled="!showFooter"
                  v-model="editConfig.infomation.nextCount"
                  type="date"
                  placeholder="选择日期"
                  value-format="yyyy-MM-dd"
                >
                </el-date-picker>
              </el-form-item>
            </div>
            <el-form-item label="备注" prop="notes">
              <el-input
                :disabled="!showFooter"
                type="textarea"
                placeholder="外部备注"
                :autosize="{ minRows: 3, maxRows: 4 }"
                maxlength="500"
                clearable
                v-model="editConfig.infomation.notes"
                style="width: 96%"
              ></el-input>
            </el-form-item>
          </div>
          <el-form-item label="" prop="notes" label-width="20px">
            <el-input
              :disabled="!showFooter"
              type="textarea"
              placeholder="外部备注"
              :autosize="{ minRows: 3, maxRows: 4 }"
              maxlength="500"
              clearable
              v-model="editConfig.infomation.notes"
            ></el-input>
          </el-form-item>
          <div class="bottom">
            <!-- <div class="left"> -->
            <!-- <div class="second-label">物流</div> -->
@@ -163,9 +166,9 @@
        </div>
      </el-form>
      <!-- 尾 -->
      <div v-if="showFooter" slot="footer" class="dialog-footer">
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">保存</el-button>
        <el-button size="small" @click="editConfig.visible = false">取消</el-button>
        <el-button type="primary" size="small" @click="saveClick('form')">保存</el-button>
      </div>
    </el-dialog>
  </div>
@@ -347,18 +350,21 @@
.content-status {
  display: flex;
}
.content-number-bg {
  margin-top: 10px;
}
.basic-info {
  height: calc(100% - 80px);
  overflow: auto;
  margin: 20px;
  border: 1px solid #dcdfe6;
  box-shadow: inset 0 0 2px #dee2e6;
  -moz-box-shadow: inset 0 0 2px #dee2e6;
  -webkit-box-shadow: inset 0 0 2px #dee2e6;
  .basic-info-view {
    margin-top: 20px;
    padding: 0 20px;
  }
  // border: 1px solid #dcdfe6;
  // box-shadow: inset 0 0 2px #dee2e6;
  // -moz-box-shadow: inset 0 0 2px #dee2e6;
  // -webkit-box-shadow: inset 0 0 2px #dee2e6;
  // .basic-info-view {
  //   margin-top: 20px;
  //   padding: 0 20px;
  // }
  .bottom {
    display: flex;
    margin-left: 20px;
src/views/warehouseManage/warehouse/AddDialog.vue
@@ -27,96 +27,113 @@
        ref="form"
        :model="editConfig.infomation"
        :rules="rules"
        label-position="left"
        label-position="right"
        label-width="100px"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
        <div>
          <!-- <div>aaa</div> -->
        <div class="content-number-bg">
          <FormBtnsView :showWarehouse="true" @productClick="productClick" />
        </div>
        <div class="basic-info">
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24" class="line_height_30px">
              <el-col :span="12" class="line_height_30px">
                <el-form-item label="仓库" prop="name">
                  <el-input
                  :disabled="showEdit"
                    v-model="editConfig.infomation.name"
                    placeholder="请输入"
                  ></el-input>
                  <el-input :disabled="showEdit" v-model="editConfig.infomation.name" placeholder="请输入"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="11">
              <el-col :span="12">
                <el-form-item label="缩写" prop="code">
                  <el-input
                  :disabled="showEdit"
                    v-model="editConfig.infomation.code"
                    placeholder="请输入"
                  ></el-input>
                  <el-input :disabled="showEdit" v-model="editConfig.infomation.code" placeholder="请输入"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="2">&nbsp;</el-col>
              <el-col :span="11">
              <el-col :span="12">
                <el-form-item label="地址" prop="address">
                  <el-input
                  :disabled="showEdit"
                    :disabled="showEdit"
                    v-model="editConfig.infomation.address"
                    placeholder="请输入"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="入向运输" prop="inboundTransportation">
                  <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.inboundTransportation">
                    <el-radio
                      style="width: 90%"
                      class="line_height_30px"
                      v-for="item in inboundTransportationList"
                      :key="item.id"
                      :disabled="item.disabled"
                      :label="item.id"
                      >{{ item.name }}</el-radio
                    >
                  </el-radio-group>
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="出库运输" prop="outboundTransportation">
                  <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.outboundTransportation">
                    <el-radio
                      style="width: 90%"
                      class="line_height_30px"
                      v-for="item in outboundTransportationList"
                      :key="item.id"
                      :disabled="item.disabled"
                      :label="item.id"
                      >{{ item.name }}</el-radio
                    >
                  </el-radio-group>
                </el-form-item>
              </el-col>
            </el-row>
          </div>
          <div class="bottom">
          <!-- <div class="bottom">
            <el-tabs v-model="activeName" type="card">
              <el-tab-pane label="仓库配置" name="first">
                <div class="second-label">运输</div>
                <el-form-item label="入向运输" prop="inboundTransportation">
                  <el-radio-group
                  :disabled="showEdit"
                  v-model="editConfig.infomation.inboundTransportation"
                  >
                    <el-radio style="width:100%;" class="line_height_30px"
                     v-for="(item) in inboundTransportationList"
                     :key='item.id'
                     :disabled="item.disabled"
                     :label="item.id"
                      >{{item.name}}</el-radio>
                  <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.inboundTransportation">
                    <el-radio
                      style="width: 100%"
                      class="line_height_30px"
                      v-for="item in inboundTransportationList"
                      :key="item.id"
                      :disabled="item.disabled"
                      :label="item.id"
                      >{{ item.name }}</el-radio
                    >
                  </el-radio-group>
                </el-form-item>
                <el-form-item label="出库运输" prop="outboundTransportation">
                  <el-radio-group
                  :disabled="showEdit"
                  v-model="editConfig.infomation.outboundTransportation"
                  >
                    <el-radio style="width:100%;" class="line_height_30px"
                    v-for="(item) in outboundTransportationList"
                     :key='item.id'
                     :disabled="item.disabled"
                     :label="item.id"
                     >{{item.name}}</el-radio>
                  <el-radio-group :disabled="showEdit" v-model="editConfig.infomation.outboundTransportation">
                    <el-radio
                      style="width: 100%"
                      class="line_height_30px"
                      v-for="item in outboundTransportationList"
                      :key="item.id"
                      :disabled="item.disabled"
                      :label="item.id"
                      >{{ item.name }}</el-radio
                    >
                  </el-radio-group>
                </el-form-item>
              </el-tab-pane>
            </el-tabs>
          </div>
          </div> -->
        </div>
      </el-form>
      <!-- 尾 -->
      <div v-if="showFooter" slot="footer" class="dialog-footer">
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">保存</el-button>
        <el-button size="small" @click="editConfig.visible = false">取消</el-button>
        <el-button type="primary" size="small" @click="saveClick('form')">保存</el-button>
      </div>
    </el-dialog>
  </div>
</template>
<script>
import { addWarehouse,updateWarehouse,deleteWarehouse } from "@/api/warehouseManage/warehouse"
import { getDataByType } from "@/api/data";
import { addWarehouse, updateWarehouse, deleteWarehouse } from "@/api/warehouseManage/warehouse"
import { getDataByType } from "@/api/data"
export default {
  name: "AddScrapDialog",
  props: {
@@ -135,20 +152,20 @@
  computed: {},
  data() {
    return {
      activeName:'first',
      activeName: "first",
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        name: [{ required: true, message: "请输入", trigger: "change" }],
        code: [{ required: true, message: "请输入", trigger: "change" }],
        code: [{ required: true, message: "请输入", trigger: "change" }]
      },
      memberOptions: [],
      paymentTypeListOptions: [],
      showEdit: false, // 是否显示编辑按钮
      showFooter: false, // 是否显示取消保存
      currentState: "todo", // 当前状态
      inboundTransportationList:getDataByType('inboundTransportation'),
      outboundTransportationList:getDataByType('outboundTransportation'),
      inboundTransportationList: getDataByType("inboundTransportation"),
      outboundTransportationList: getDataByType("outboundTransportation")
    }
  },
  created() {
@@ -156,9 +173,7 @@
  },
  methods: {
    // 路线
    productClick() {
    },
    productClick() {},
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建") {
@@ -178,16 +193,16 @@
    },
    // 刪除
    deleteClick() {
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation));
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
      deleteWarehouse({ id: data.id }).then((res) => {
        if (res.code === 200) {
          this.editConfig.visible = false;
          this.$message.success("刪除成功!");
          this.$emit("refresh");
        }else {
                    this.$message.warning(res.msg?res.msg:"刪除失败!")
                }
      });
          this.editConfig.visible = false
          this.$message.success("刪除成功!")
          this.$emit("refresh")
        } else {
          this.$message.warning(res.msg ? res.msg : "刪除失败!")
        }
      })
    },
    // 编辑
    editClick() {
@@ -195,52 +210,52 @@
      this.showFooter = true
    },
    saveParams() {
      let data =JSON.parse(JSON.stringify(this.editConfig.infomation));
      let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
      let params = {
        address:data.address,
        buyToResupply:data.buyToResupply,
        code:data.code,
        name:data.name,
        inboundTransportation:data.inboundTransportation,
        outboundTransportation:data.outboundTransportation,
        address: data.address,
        buyToResupply: data.buyToResupply,
        code: data.code,
        name: data.name,
        inboundTransportation: data.inboundTransportation,
        outboundTransportation: data.outboundTransportation
      }
      if(data.id){
        params.id=data.id
      if (data.id) {
        params.id = data.id
      }
      return params;
      return params
    },
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          const params = this.saveParams();
            if (this.editConfig.title === "新建") {
              addWarehouse(params).then((res) => {
                if (res.code === 200) {
                  this.editConfig.visible = false;
                  this.$message.success("添加成功!");
                  this.$emit('refresh')
                }else {
                    this.$message.warning(res.msg?res.msg:"添加失败!")
                }
              });
            } else {
              updateWarehouse(params).then((res) => {
                if (res.code === 200) {
                  this.editConfig.visible = false;
                  this.$message.success("编辑成功!");
                  this.$emit('refresh')
                }else {
                    this.$message.warning(res.msg?res.msg:"编辑失败!")
                }
              });
            }
        }else {
          console.log("error submit");
          return false;
          const params = this.saveParams()
          if (this.editConfig.title === "新建") {
            addWarehouse(params).then((res) => {
              if (res.code === 200) {
                this.editConfig.visible = false
                this.$message.success("添加成功!")
                this.$emit("refresh")
              } else {
                this.$message.warning(res.msg ? res.msg : "添加失败!")
              }
            })
          } else {
            updateWarehouse(params).then((res) => {
              if (res.code === 200) {
                this.editConfig.visible = false
                this.$message.success("编辑成功!")
                this.$emit("refresh")
              } else {
                this.$message.warning(res.msg ? res.msg : "编辑失败!")
              }
            })
          }
        } else {
          console.log("error submit")
          return false
        }
      });
      })
    }
  }
}
@@ -264,29 +279,31 @@
.content-status {
  display: flex;
}
.content-number-bg {
  margin-top: 10px;
}
.basic-info {
  height: calc(100% - 80px);
  overflow: auto;
  margin: 20px;
  border: 1px solid #dcdfe6;
  box-shadow: inset 0 0 2px #dee2e6;
  -moz-box-shadow: inset 0 0 2px #dee2e6;
  -webkit-box-shadow: inset 0 0 2px #dee2e6;
  .basic-info-view {
    margin-top: 20px;
    padding:0 20px;
  // border: 1px solid #dcdfe6;
  // box-shadow: inset 0 0 2px #dee2e6;
  // -moz-box-shadow: inset 0 0 2px #dee2e6;
  // -webkit-box-shadow: inset 0 0 2px #dee2e6;
  // .basic-info-view {
  //   margin-top: 20px;
  //   padding: 0 20px;
  // }
  }
  .bottom{
  .bottom {
    .second-label {
      border-bottom: 1px solid #d9d9d9;
      margin-bottom: 10px;
    }
    ::v-deep .el-tabs__content{
    ::v-deep .el-tabs__content {
      padding: 0 20px;
    }
  }
}
.purchase-view {
  display: flex;
@@ -309,8 +326,18 @@
      color: #333;
    }
  }
  .el-tabs--card > .el-tabs__header .el-tabs__nav {
    margin-left: 20px;
  .el-tabs--card > .el-tabs__header {
    border-bottom: none;
  }
  .el-tabs__item.is-active {
    color: #fff;
    background: #2a78fb;
  }
  .el-tabs__item {
    height: 30px;
    line-height: 30px;
    font-size: 13px;
    background: #f3f3f3;
  }
  .el-tabs__item {
    height: 30px;