Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 b12ea16fa2d9440e9680127d126a4f3af450afd2

 src/views/productManage/product/AddProductDialog.vue

@@ -1,14 +1,14 @@
<template>
  <div class="add-common">
    <el-dialog
      :title="editCommonConfig.title + '采购入库'"
      :title="editCommonConfig.title + '产品'"
      :visible.sync="editConfig.visible"
      :width="dialogWidth"
      :before-close="handleClose"
    >
      <!-- 头 -->
      <div slot="title" class="dialog-header">
        <span>{{ editCommonConfig.title + "采购入库" }}</span>
        <span>{{ editCommonConfig.title + "产品" }}</span>
        <div class="header_btns">
          <span class="btn">
            <i class="el-icon-printer"></i>
@@ -26,16 +26,16 @@
        ref="form"
        :model="editConfig.infomation"
        :rules="rules"
        label-position="left"
        label-position="right"
        label-width="110px"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
        style="height: 53vh; overflow-x: hidden"
      >
        <div class="content-btn">
        <!-- <div class="content-btn">
          <el-button plain size="mini" disabled>标签打印</el-button>
          <el-button plain size="mini" disabled>更新数量</el-button>
          <el-button plain size="mini" disabled>执行补货</el-button>
        </div>
        </div> -->
        <div class="basic-info">
          <FormBtnsView
            :add-product="addProduct"
@@ -43,32 +43,6 @@
            :show-procure="showProcure"
            :show-sale="showSale"
          />
          <div class="basic-info-view">
            <el-row>
              <el-col :span="23">
                <div style="margin-left: 20px"><span style="color: #f56c6c">*</span>产品名称</div>
                <el-form-item label="" prop="name" label-width="20px">
                  <el-input v-model="editConfig.infomation.name" placeholder="" :disabled="!showFooter"></el-input>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="4">
                <div class="upload" @click="toGetImg">
                  <img v-if="imageSrc" :src="imageSrc" style="height: 90px; width: 90px" />
                  <div v-else class="upload-icon"><i class="el-icon-plus"></i></div>
                </div>
              </el-col> -->
              <!-- <el-col :span="24">
                <div style="margin-left: 20px">
                  <el-checkbox v-model="marketable" :disabled="!showFooter" @change="checkboxChange('销售', $event)"
                    >可销售</el-checkbox
                  >
                  <el-checkbox v-model="procurable" :disabled="!showFooter" @change="checkboxChange('采购', $event)"
                    >可采购</el-checkbox
                  >
                </div>
              </el-col> -->
            </el-row>
          </div>
          <div class="bottom">
            <el-tabs v-model="activeName" type="card">
              <el-tab-pane label="基本信息" name="first"></el-tab-pane>
@@ -81,7 +55,15 @@
            <div v-if="activeName === 'first'">
              <div class="purchase-view">
                <div class="left">
                  <el-form-item label="产品类型" prop="productType" style="margin-left: 20px">
                  <el-form-item label="产品名称" prop="name">
                    <el-input
                      v-model="editConfig.infomation.name"
                      placeholder=""
                      :disabled="!showFooter"
                      style="width: 85%"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="产品类型" prop="productType">
                    <el-select
                      v-model="editConfig.infomation.productType"
                      placeholder="请选择"
@@ -93,7 +75,7 @@
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="开票策略" prop="invoicingStrategy" style="margin-left: 20px">
                  <!-- <el-form-item label="开票策略" prop="invoicingStrategy" >
                    <el-select
                      v-model="editConfig.infomation.invoicingStrategy"
                      placeholder="请选择"
@@ -106,8 +88,8 @@
                    </el-select>
                    <div class="font_size_13" style="color: gray">可储存的产品是您管理库存水平的实物项目。</div>
                    <div class="font_size_13" style="color: gray">您可以在发货前为其开具结算单。</div>
                  </el-form-item>
                  <el-form-item label="物料类型" prop="model" style="margin-left: 20px">
                  </el-form-item> -->
                  <el-form-item label="物料类型" prop="model">
                    <el-select
                      v-model="editConfig.infomation.model"
                      placeholder="请选择"
@@ -121,7 +103,7 @@
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="单位" prop="unit" style="margin-left: 20px">
                  <el-form-item label="单位" prop="unit">
                    <el-input
                      v-model="editConfig.infomation.unit"
                      placeholder="请输入"
@@ -129,7 +111,7 @@
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="产品标签" prop="productTagName" style="margin-left: 20px">
                  <el-form-item label="产品标签" prop="productTagName">
                    <el-input
                      v-model="editConfig.infomation.productTagName"
                      placeholder="请输入"
@@ -139,8 +121,8 @@
                  </el-form-item>
                </div>
                <div class="right">
                  <el-form-item label="销售价格" prop="salePrice" style="margin-left: 20px">
                    <span>￥</span>
                  <el-form-item label="销售价格" prop="salePrice">
                    <!-- <span>￥</span> -->
                    <el-input-number
                      v-model.trim="editConfig.infomation.salePrice"
                      placeholder="请输入"
@@ -151,7 +133,7 @@
                      :disabled="!showFooter"
                    ></el-input-number>
                  </el-form-item>
                  <el-form-item label="销项税" prop="customerTaxes" style="margin-left: 20px">
                  <!-- <el-form-item label="销项税" prop="customerTaxes" >
                    <el-input-number
                      v-model="editConfig.infomation.customerTaxes"
                      placeholder="请输入"
@@ -160,9 +142,9 @@
                      style="width: 85%; margin-right: 5px"
                      :disabled="!showFooter"
                    ></el-input-number>
                  </el-form-item>
                  <el-form-item label="成本" prop="cost" style="margin-left: 20px">
                    <span>￥</span>
                  </el-form-item> -->
                  <el-form-item label="成本" prop="cost">
                    <!-- <span>￥</span> -->
                    <el-input-number
                      v-model.trim="editConfig.infomation.cost"
                      placeholder="请输入"
@@ -173,7 +155,7 @@
                      :disabled="!showFooter"
                    ></el-input-number>
                  </el-form-item>
                  <el-form-item label="产品类别" prop="categoryId" style="margin-left: 20px">
                  <el-form-item label="产品类别" prop="categoryId">
                    <el-select
                      v-model="editConfig.infomation.categoryId"
                      placeholder="请选择"
@@ -190,7 +172,7 @@
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="内部参考" prop="internalReference" style="margin-left: 20px">
                  <el-form-item label="内部编码" prop="internalReference">
                    <el-input
                      v-model.trim="editConfig.infomation.internalReference"
                      placeholder="请输入"
@@ -199,7 +181,7 @@
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="条码" prop="barcode" style="margin-left: 20px">
                  <el-form-item label="条码" prop="barcode">
                    <el-input
                      v-model.trim="editConfig.infomation.barcode"
                      placeholder="请输入"
@@ -211,8 +193,8 @@
                </div>
              </div>
              <div class="all">
                <div class="second-label">内部说明</div>
                <el-form-item label="" prop="internalNotes" style="margin-left: 20px" label-width="0px">
                <!-- <div class="second-label">备注</div> -->
                <el-form-item label="备注" prop="internalNotes">
                  <el-input
                    v-model.trim="editConfig.infomation.internalNotes"
                    placeholder="请输入"
@@ -235,7 +217,7 @@
              <div class="purchase-view">
                <!-- <div class="left">
                  <div class="second-label">操作</div>
                  <el-form-item label="路线" prop="checkedRoute" style="margin-left: 20px">
                  <el-form-item label="路线" prop="checkedRoute" >
                    <el-checkbox-group v-model="checkedRoute" :min="1" :max="2">
                      <el-checkbox v-for="city in route" :label="city" :key="city" class="list-item">{{
                        city.length > 20 ? city.substring(0, 20) + "..." : city
@@ -244,7 +226,7 @@
                  </el-form-item>
                </div> -->
                <div class="left">
                  <el-form-item label="负责人" prop="principal" style="margin-left: 20px" label-width="80px">
                  <el-form-item label="负责人" prop="principal" label-width="80px">
                    <el-select
                      v-model="editConfig.infomation.principal"
                      placeholder="请选择"
@@ -256,7 +238,7 @@
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="重量" prop="weight" style="margin-left: 20px" label-width="80px">
                  <el-form-item label="重量" prop="weight" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.weight"
                      placeholder="请输入"
@@ -268,7 +250,7 @@
                    ></el-input-number>
                    <span> kg</span>
                  </el-form-item>
                  <el-form-item label="体积" prop="volume" style="margin-left: 20px" label-width="80px">
                  <el-form-item label="体积" prop="volume" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.volume"
                      placeholder="请输入"
@@ -282,12 +264,7 @@
                  </el-form-item>
                </div>
                <div class="right">
                  <el-form-item
                    label="制造前置时间"
                    prop="makeAdvanceTime"
                    style="margin-left: 20px"
                    label-width="130px"
                  >
                  <el-form-item label="制造前置时间" prop="makeAdvanceTime" label-width="130px">
                    <el-input-number
                      v-model="editConfig.infomation.makeAdvanceTime"
                      placeholder="请输入"
@@ -299,12 +276,7 @@
                    ></el-input-number>
                    <span> 天数</span>
                  </el-form-item>
                  <el-form-item
                    label="生产订单准备天数"
                    prop="orderAdvanceTime"
                    style="margin-left: 20px"
                    label-width="130px"
                  >
                  <el-form-item label="生产订单准备天数" prop="orderAdvanceTime" label-width="130px">
                    <el-input-number
                      v-model="editConfig.infomation.orderAdvanceTime"
                      placeholder="请输入"
@@ -316,12 +288,7 @@
                    ></el-input-number>
                    <span> 天数</span>
                  </el-form-item>
                  <el-form-item
                    label="客户前置时间"
                    prop="deliveryAdvanceTime"
                    style="margin-left: 20px"
                    label-width="130px"
                  >
                  <el-form-item label="客户前置时间" prop="deliveryAdvanceTime" label-width="130px">
                    <el-input-number
                      v-model="editConfig.infomation.deliveryAdvanceTime"
                      placeholder="请输入"
@@ -335,10 +302,10 @@
                  </el-form-item>
                </div>
              </div>
              <div class="purchase-view">
              <!-- <div class="purchase-view">
                <div class="left">
                  <div class="second-label">收货说明</div>
                  <el-form-item label="" prop="inStorageExplain" style="margin-left: 20px" label-width="0px">
                  <el-form-item label="" prop="inStorageExplain"  label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.inStorageExplain"
                      placeholder="此说明添加到收货订单中(例如，产品在仓库的存储位置)"
@@ -352,7 +319,7 @@
                </div>
                <div class="right">
                  <div class="second-label">出库单说明</div>
                  <el-form-item label="" prop="outStorageExplain" style="margin-left: 20px" label-width="0px">
                  <el-form-item label="" prop="outStorageExplain"  label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.outStorageExplain"
                      placeholder="此通知已添加到送货单中"
@@ -368,7 +335,7 @@
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">内部调拨说明</div>
                  <el-form-item label="" prop="internalTransferExplain" style="margin-left: 20px" label-width="0px">
                  <el-form-item label="" prop="internalTransferExplain"  label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.internalTransferExplain"
                      placeholder="此说明添加到内部调拨订单中(例如，在仓库中何处提取产品)"
@@ -381,7 +348,7 @@
                  </el-form-item>
                </div>
                <div class="right"></div>
              </div>
              </div> -->
            </div>
            <!-- 下面不要删 二期或三期会用到 -->
            <!-- 销售 -->
@@ -389,7 +356,7 @@
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">{{ "加售&交叉销售" }}</div>
                  <el-form-item label="可选产品" prop="selectProduct" style="margin-left: 20px">
                  <el-form-item label="可选产品" prop="selectProduct" >
                    <el-select
                      v-model="editConfig.infomation.selectProduct"
                      multiple
@@ -408,7 +375,7 @@
                    </el-select>
                  </el-form-item>
                  <div class="second-label">销售说明</div>
                  <el-form-item label="" prop="sellExplain" style="margin-left: 20px" label-width="20px">
                  <el-form-item label="" prop="sellExplain"  label-width="20px">
                    <el-input
                      v-model.trim="editConfig.infomation.sellExplain"
                      size="mini"
@@ -443,7 +410,7 @@
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">供应商账单</div>
                  <el-form-item label="进项税" prop="client_name" style="margin-left: 20px">
                  <el-form-item label="进项税" prop="client_name" >
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      multiple
@@ -456,7 +423,7 @@
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="控制策略" prop="client_name" style="margin-left: 20px">
                  <el-form-item label="控制策略" prop="client_name" >
                    <el-radio-group v-model="editConfig.infomation.resource">
                      <el-radio label="订单数量"></el-radio>
                      <el-radio label="收到数量"></el-radio>
@@ -465,7 +432,7 @@
                </div>
                <div class="right">
                  <div class="second-label">采购说明</div>
                  <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
                  <el-form-item label="" prop="name"  label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.desc"
                      placeholder="本条备注被添加到采购订单"
@@ -794,16 +761,19 @@
.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;
  margin: 10px;
  // 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;
  .bottom {
    margin-top: 10px;
  }
  .content-number {
    display: flex;
    justify-content: right;
    height: 44px;
    border-bottom: 1px solid #e9e9e9;
    // border-bottom: 1px solid #e9e9e9;
    font-size: 13px;
    .sub-number {
      width: 12.5%;
@@ -827,22 +797,6 @@
          height: 38px;
          line-height: 38px;
        }
      }
    }
  }
  .basic-info-view {
    margin-top: 20px;
    .upload {
      position: relative;
      width: 90px;
      height: 90px;
      margin-left: 40px;
      border: 1px dotted #d9d9d9;
      border-radius: 4px;
      .upload-icon {
        position: absolute;
        top: 40%;
        right: 43%;
      }
    }
  }
@@ -902,13 +856,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-input__inner {
    text-align: left;