Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

Merge branch 'dev' into songshankun/adjust-style

 src/components/makepager/CommonFormTableView.vue

@@ -456,7 +456,8 @@
    padding: 0 5px;
  }
  .el-input__inner {
    text-align: left;
    // text-align: left;
    text-align: center !important;
  }
}
</style>

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -113,44 +113,57 @@
        }
        this.searchSel = { value: "number", label: "单据编号" }
      } else if (this.editConfig.title === "服务合同") {
        this.tableList = {
          tableInfomation: [],
          tableColumn: [
            { label: "客户名称", prop: "client_name" }, // 客户名称
        this.tableColumn = [
          { label: "客户名称", prop: "client_name", default: true }, // 客户名称
            { label: "服务合同编号", prop: "number", isClick: true }, // 服务合同编号
            { label: "负责人", prop: "member_name" }, // 负责人
            { label: "合计", prop: "total" }, // 合计
            { label: "签约日期", prop: "signTime", isTime: true }, // 签约日期
            { label: "合同状态", prop: "serviceContractStatus" } // 合同状态
          ]
        this.showCol = ["客户名称", "服务合同编号", "负责人", "合计", "签约日期", "合同状态"]
        this.tableList = {
          selectIndex: true,
          tableInfomation: [],
          allcol: [],
          showcol: this.showCol,
          tableColumn: this.setColumnVisible(this.showCol)
        }
        this.searchSel = { value: "number", label: "服务合同编号" }
      } else if (this.editConfig.title === "销售明细单") {
        this.tableList = {
          tableInfomation: [],
          tableColumn: [
            { label: "客户名称", prop: "client_name" }, // 客户名称
        this.tableColumn = [
          { label: "客户名称", prop: "client_name", default: true }, // 客户名称
            { label: "订单编号", prop: "number", isClick: true }, // 订单编号
            { label: "签约日期", prop: "signTime" }, // 签约日期
            { label: "销售负责人", prop: "member_name" }, // 销售负责人
            { label: "合计", prop: "tptal" } // 合计
          ]
        this.showCol = ["客户名称", "订单编号", "签约日期", "销售负责人", "合计"]
        this.tableList = {
          selectIndex: true,
          tableInfomation: [],
          allcol: [],
          showcol: this.showCol,
          tableColumn: this.setColumnVisible(this.showCol)
        }
        this.searchSel = { value: "number", label: "订单编号" }
      } else if (this.editConfig.title === "报价单") {
        this.tableList = {
          tableInfomation: [],
          tableColumn: [
            { label: "报价单号", prop: "number", isClick: true }, // 报价单号
        this.tableColumn = [
          { label: "报价单号", prop: "number", isClick: true, default: true }, // 报价单号
            { label: "销售负责人", prop: "member_name" } // 销售负责人
          ]
        this.showCol = ["报价单号", "销售负责人"]
        this.tableList = {
          selectIndex: true,
          tableInfomation: [],
          allcol: [],
          showcol: this.showCol,
          tableColumn: this.setColumnVisible(this.showCol)
        }
        this.searchSel = { value: "number", label: "报价单号" }
      } else if (this.editConfig.title === "客户服务单") {
        this.tableList = {
          tableInfomation: [],
          tableColumn: [
            { label: "服务单编号", prop: "serviceNumber", isClick: true }, // 服务单编号
        this.tableColumn = [
          { label: "服务单编号", prop: "serviceNumber", isClick: true, default: true }, // 服务单编号
            { label: "主题", prop: "subject" }, // 主题
            { label: "服务方式", prop: "serviceType_name" }, // 服务方式
            { label: "服务人员", prop: "serviceMan_name" }, // 服务人员
@@ -158,26 +171,43 @@
            { label: "处理状态", prop: "serviceOrderStatus_name" }, // 处理状态
            { label: "客户签名", prop: "qianming" } // 客户签名
          ]
        this.showCol = ["服务单编号", "主题", "服务方式", "服务人员", "优先级别", "处理状态", "客户签名"]
        this.tableList = {
          selectIndex: true,
          tableInfomation: [],
          allcol: [],
          showcol: this.showCol,
          tableColumn: this.setColumnVisible(this.showCol)
        }
        this.searchSel = { value: "serviceNumber", label: "服务单编号" }
      } else if (this.editConfig.title === "产品名称") {
        this.tableList = {
          tableInfomation: [],
          tableColumn: [
            { label: "产品名称", prop: "name", isClick: true },
        this.tableColumn = [
          { label: "产品名称", prop: "name", isClick: true, default: true }, // 产品名称
            { label: "产品编号", prop: "number" }
          ]
        this.showCol = ["产品名称", "产品编号"]
        this.tableList = {
          selectIndex: true,
          tableInfomation: [],
          allcol: [],
          showcol: this.showCol,
          tableColumn: this.setColumnVisible(this.showCol)
        }
        this.searchSel = { value: "name", label: "产品名称" }
      } else if (this.editConfig.title === "销售退货单") {
        this.tableList = {
          tableInfomation: [],
          tableColumn: [
            { label: "退货单编号", prop: "number", isClick: true },
        this.tableColumn = [
          { label: "退货单编号", prop: "number", isClick: true, default: true }, // 退货单编号
            { label: "退货日期", prop: "returnDate" },
            { label: "状态", prop: "salesReturnStatus_name" },
            { label: "退入仓库", prop: "repository" }
          ]
        this.showCol = ["退货单编号", "退货日期", "状态", "退入仓库"]
        this.tableList = {
          selectIndex: true,
          tableInfomation: [],
          allcol: [],
          showcol: this.showCol,
          tableColumn: this.setColumnVisible(this.showCol)
        }
        this.searchSel = { value: "number", label: "销售退货单编号" }
      }

 src/views/sales/refundForm/AddRefundFormDialog.vue

@@ -13,7 +13,7 @@
        :model="editConfig.infomation"
        :rules="rules"
        label-position="right"
        label-width="308px"
        label-width="30%"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
@@ -27,6 +27,7 @@
                <el-form-item label="客户名称" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                    style="width:100%"
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -51,13 +52,16 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="退款单编号" prop="number">
                  <el-input v-model="editConfig.infomation.number"></el-input>
                  <el-input v-model="editConfig.infomation.number" 
                    style="width:100%"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售退货单" prop="sale_return_nunber">
                  <div class="custom-name">
                    <el-autocomplete
                    
                    style="width:100%"
                      v-model="editConfig.infomation.sale_return_nunber"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -85,10 +89,10 @@
              <el-col :span="12">
                <el-form-item label="销售负责人" prop="memberId">
                  <el-select
                  style="width:100%"
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
@@ -98,6 +102,7 @@
              <el-col :span="12">
                <el-form-item label="退款日期" prop="refundDate">
                  <el-date-picker
                  style="width:100%"
                    v-model="editConfig.infomation.refundDate"
                    value-format="yyyy-MM-dd"
                    type="date"
@@ -110,6 +115,7 @@
                <el-form-item label="付款方式" prop="paymentTypeId">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      v-model="editConfig.infomation.paymentTypeId"
                      placeholder="请选择"
                      class="common-select-sel"
@@ -131,6 +137,7 @@
                <el-form-item label="账户" prop="bankAccountId">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      v-model="editConfig.infomation.bankAccountId"
                      placeholder="请选择"
                      class="common-select-sel"
@@ -147,6 +154,7 @@
                <el-form-item label="是否开票" prop="isInvoice">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      v-model="editConfig.infomation.isInvoice"
                      placeholder="请选择"
                      class="common-select-sel"
@@ -165,8 +173,9 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="退款原因" prop="reason">
                <el-form-item label="退款原因" prop="reason" label-width="15%">
                  <el-input
                  style="width:100%"
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.reason"
@@ -319,7 +328,7 @@
  },
  data() {
    return {
      dialogWidth: "80%",
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],

 src/views/sales/refundForm/index.vue

@@ -16,7 +16,7 @@
        >
          <template slot="leftButton">
            <el-button size="small" type="primary"  @click="addBtnClick">新建</el-button>
            <el-button size="small"  @click="delClick">删除</el-button>
            <!-- <el-button size="small"  @click="delClick">删除</el-button> -->
          </template>
        </CommonSearch>
      </div>
@@ -28,7 +28,6 @@
          <TableCommonView
              ref="tableListRef"
              :table-list="tableList"
              :select-box="!isDetail"
              @selClientClick="selClientClick"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
@@ -38,7 +37,7 @@
              <el-table-column label="操作" width="100">
                <template slot-scope="scope">
                  <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
                  <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button> -->
                  <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button>
                </template>
              </el-table-column>
            </template>
@@ -154,6 +153,7 @@
  methods: {
    setTable() {
      this.tableList = {
        selectIndex: true,
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -13,7 +13,7 @@
        :model="editConfig.infomation"
        :rules="rules"
        label-position="right"
        label-width="308px"
        label-width="30%"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
@@ -27,6 +27,7 @@
                <el-form-item label="客户名称" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                      style="width:100%;"
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -51,13 +52,14 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="订单编号" prop="number">
                  <el-input v-model="editConfig.infomation.number"></el-input>
                  <el-input v-model="editConfig.infomation.number" style="width:100%"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售机会" prop="saleChanceId">
                  <div class="custom-name">
                    <el-autocomplete
                      style="width:100%"
                      v-model="editConfig.infomation.sale_chance_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -100,6 +102,7 @@
                    value-format="yyyy-MM-dd"
                    type="date"
                    placeholder="选择日期"
                    style="width:100%"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -107,10 +110,11 @@
              <el-col :span="12">
                <el-form-item label="销售负责人" prop="memberId">
                  <el-select
                  
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 100%"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
@@ -124,6 +128,7 @@
                    value-format="yyyy-MM-dd"
                    type="date"
                    placeholder="选择日期"
                    style="width:100%"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -167,9 +172,10 @@
                  <el-input v-model="editConfig.infomation.phone"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="24">
              <el-col :span="12">
                <el-form-item label="收货地址" prop="address">
                  <el-input
                    style="width:100%"
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.address"
@@ -205,8 +211,9 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="条款与条件" prop="conditions">
                <el-form-item label="条款与条件" prop="conditions" label-width="15%">
                  <el-input
                    style="width:100%;"
                    type="textarea"
                    :autosize="{ minRows: 4 }"
                    v-model="editConfig.infomation.conditions"
@@ -220,7 +227,7 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="备注" prop="remark">
                <el-form-item label="备注" prop="remark" label-width="15%">
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2 }"
@@ -381,7 +388,7 @@
  },
  data() {
    return {
      dialogWidth: "80%",
      dialogWidth: "60%",
      editConfig: this.editCommonConfig,
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],
@@ -555,8 +562,10 @@
    handleSelectClient(value, item) {
      if (value === "client") {
        this.clientId = item.id
        this.editConfig.infomation.client_name = item.name
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.client_name = item.name
      }
    },
    selClientClick(value) {
@@ -676,6 +685,11 @@
<style lang="scss" scoped>
::v-deep {
  .iframe-dialog .el-dialog__body {
    .el-form{
      .el-form-item{
        width: 100%;
      }
    }
    .basic-info {
      .basic-info-title {
        background-color: #f4f8fe;

 src/views/sales/salesDetails/index.vue

@@ -16,7 +16,7 @@
        >
          <template slot="leftButton">
            <el-button size="small" type="primary"  @click="addBtnClick">新建</el-button>
            <el-button size="small"  @click="delClick">删除</el-button>
            <!-- <el-button size="small"  @click="delClick">删除</el-button> -->
          </template>
        </CommonSearch>
      </div>
@@ -29,7 +29,6 @@
              ref="tableListRef"
              :show-summary="showSummary"
              :table-list="tableList"
              :select-box="!isDetail"
              @selClientClick="selClientClick"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
@@ -39,7 +38,7 @@
              <el-table-column label="操作" width="90">
                <template slot-scope="scope">
                  <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
                  <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button> -->
                  <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button>
                </template>
              </el-table-column>
            </template>
@@ -194,6 +193,7 @@
  methods: {
    setTable() {
      this.tableList = {
        selectIndex: true,
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,

 src/views/sales/salesReturn/AddSalesReturnDialog.vue

@@ -13,7 +13,7 @@
        :model="editConfig.infomation"
        :rules="rules"
        label-position="right"
        label-width="308px"
        label-width="30%"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
@@ -27,6 +27,7 @@
                <el-form-item label="客户名称" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                      style="width:100%"
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -51,13 +52,14 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售退货单编号" prop="number">
                  <el-input v-model="editConfig.infomation.number"></el-input>
                  <el-input v-model="editConfig.infomation.number" style="width:100%"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同订单">
                  <div class="custom-name">
                    <el-autocomplete
                    style="width:100%"
                      v-model="editConfig.infomation.salesDetailNumber"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -82,7 +84,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="退入仓库" prop="repository">
                  <el-select v-model="editConfig.infomation.repository" size="mini" style="width: 63%">
                  <el-select v-model="editConfig.infomation.repository" size="mini" style="width: 100%">
                    <el-option v-for="item in repositoryOptions" :key="item.id" :label="item.name" :value="item.name">
                    </el-option>
                  </el-select>
@@ -94,7 +96,7 @@
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 100%"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
@@ -108,6 +110,7 @@
                    value-format="yyyy-MM-dd"
                    type="date"
                    placeholder="选择日期"
                    style="width:100%"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -122,6 +125,7 @@
                <el-form-item label="状态" prop="salesReturnStatusId">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      v-model="editConfig.infomation.salesReturnStatusId"
                      placeholder="请选择"
                      class="common-select-sel"
@@ -141,8 +145,9 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="退货原因" prop="reason">
                <el-form-item label="退货原因" prop="reason" label-width="15%">
                  <el-input
                  style="width:100%"
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.reason"
@@ -254,7 +259,7 @@
  },
  data() {
    return {
      dialogWidth: "80%",
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        number: [{ required: true, message: "请输入", trigger: "blur" }],

 src/views/sales/salesReturn/index.vue

@@ -16,7 +16,7 @@
        >
          <template slot="leftButton">
            <el-button size="small" type="primary"  @click="addBtnClick">新建</el-button>
            <el-button size="small"  @click="delClick">删除</el-button>
            <!-- <el-button size="small"  @click="delClick">删除</el-button> -->
          </template>
        </CommonSearch>
      </div>
@@ -28,7 +28,6 @@
          <TableCommonView
              ref="tableListRef"
              :table-list="tableList"
              :select-box="!isDetail"
              @selClientClick="selClientClick"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
@@ -38,7 +37,7 @@
              <el-table-column label="操作" width="90">
                <template slot-scope="scope">
                  <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
                  <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button> -->
                  <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button>
                </template>
              </el-table-column>
            </template>
@@ -159,6 +158,7 @@
  methods: {
    setTable() {
      this.tableList = {
        selectIndex: true,
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,