yangfeng
2023-10-10 0115a5fc309c214bfb17d2825d380198751f10a9
收款单、销售发票新建弹窗样式调整
4个文件已修改
101 ■■■■■ 已修改文件
src/views/other/payment/receipt/addReceipt.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/receipt/index.vue 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/saleInvoice/addSaleInvoice.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/saleInvoice/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/receipt/addReceipt.vue
@@ -13,7 +13,7 @@
        :model="editConfig.infomation"
        :rules="rules"
        label-position="right"
        label-width="308px"
        label-width="168px"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
@@ -35,6 +35,7 @@
                      "
                      value-key="name"
                      @select="handleSelectClient('client', $event)"
                      style="width: 100%"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick('client')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
@@ -67,6 +68,7 @@
                      "
                      value-key="number"
                      @select="handleSelectClient('serviceContract', $event)"
                      style="width: 100%"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick('serviceContract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
@@ -96,6 +98,7 @@
                      "
                      value-key="number"
                      @select="handleSelectClient('contract', $event)"
                      style="width: 100%"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick('contract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
@@ -116,7 +119,7 @@
                    v-model="editConfig.infomation.principalId"
                    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>
@@ -130,6 +133,7 @@
                    value-format="yyyy-MM-dd"
                    type="date"
                    placeholder="选择日期"
                    style="width: 100%"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -154,7 +158,7 @@
                    v-model="editConfig.infomation.paymentTypeId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 100%"
                  >
                    <el-option
                      v-for="item in paymentTypeListOptions"
@@ -172,7 +176,7 @@
                    v-model="editConfig.infomation.bankAccountId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 100%"
                  >
                    <el-option v-for="item in bankAccountOptions" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
@@ -190,7 +194,7 @@
          <div class="basic-info-title">收款信息</div>
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
              <el-col :span="12">
                <el-form-item label="本次收款金额" prop="amount">
                  <el-input-number
                    v-model="editConfig.infomation.amount"
@@ -198,7 +202,7 @@
                    :min="0"
                    :precision="2"
                    :controls="false"
                    style="width: 25%; margin-right: 5px"
                    style="width: 100%"
                  ></el-input-number>
                </el-form-item>
              </el-col>
@@ -350,7 +354,7 @@
  },
  data() {
    return {
      dialogWidth: "80%",
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],
src/views/other/payment/receipt/index.vue
@@ -7,16 +7,16 @@
    <div v-else class="filter">
      <div class="filter-card">
        <CommonSearch
            :show-add="false"
            :show-download="false"
            :amount-view="false"
            :show-action-btn="false"
            placeholder="请输入收款单编号"
            @searchClick="onFilterSearch"
          :show-add="false"
          :show-download="false"
          :amount-view="false"
          :show-action-btn="false"
          placeholder="请输入收款单编号"
          @searchClick="onFilterSearch"
        >
          <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" type="primary" @click="addBtnClick">新建</el-button>
            <!--            <el-button size="small"  @click="delClick">删除</el-button>-->
          </template>
        </CommonSearch>
      </div>
@@ -26,12 +26,12 @@
      <div class="body-card">
        <div class="list-view">
          <TableCommonView
              ref="tableListRef"
              v-loading="loading"
              :table-list="tableList"
              :select-box="!isDetail"
              @getSelectArray="getSelectArray"
              @selTableCol="selTableCol"
            ref="tableListRef"
            v-loading="loading"
            :table-list="tableList"
            :select-box="!isDetail"
            @getSelectArray="getSelectArray"
            @selTableCol="selTableCol"
          >
            <!-- <template slot="tableButton">
              <el-table-column label="操作" width="60" fixed="right">
@@ -124,7 +124,7 @@
      keyword: "",
      keywordType: "",
      tableColumn: [
        { label: "收款单编号", prop: "number", default: true},
        { label: "收款单编号", prop: "number", default: true },
        { label: "客户名称", prop: "client_name" },
        { label: "选择源单", prop: "sourceId" },
        { label: "实际收款金额", prop: "amount" },
@@ -132,7 +132,7 @@
        { label: "销售负责人", prop: "principal_name" },
        { label: "收款日期", prop: "receiptDate" }
      ],
      showCol:["收款单编号", "客户名称", "选择源单", "实际收款金额", "收款方式", "销售负责人", "收款日期"]
      showCol: ["收款单编号", "客户名称", "选择源单", "实际收款金额", "收款方式", "销售负责人", "收款日期"]
    }
  },
  created() {
@@ -152,9 +152,9 @@
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,
        tableColumn:this.setColumnVisible(this.showCol)
        tableColumn: this.setColumnVisible(this.showCol)
      }
      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
      this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
      this.searchOptions = []
      for (let i = 0; i < this.tableList.tableColumn.length; i++) {
        const label = this.tableList.tableColumn[i].label
@@ -162,17 +162,17 @@
        this.searchOptions.push({ value: value, label: label })
      }
    },
    setColumnVisible(showCol){
      return  this.tableColumn.map(ele=>{
    setColumnVisible(showCol) {
      return this.tableColumn.map((ele) => {
        return {
          ...ele,
          isShowColumn:showCol.includes(ele.label)
          isShowColumn: showCol.includes(ele.label)
        }
      })
    },
    selTableCol(val) {
      this.showcol = val;
      this.tableList.tableColumn = this.setColumnVisible(val);
      this.showcol = val
      this.tableList.tableColumn = this.setColumnVisible(val)
    },
    // 请求数据
    async getData() {
@@ -212,7 +212,7 @@
        })
    },
    // 搜索
    onFilterSearch(searchText){
    onFilterSearch(searchText) {
      this.keyword = searchText ?? ""
      this.keywordType = "收款单编号"
      this.pagerOptions.currPage = 1
@@ -231,7 +231,7 @@
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.sourceType = this.sourceType
      this.editConfig.infomation = { ...this.addConfig }
      this.editConfig.infomation = { ...this.addConfig, number: "" }
    }
  }
}
@@ -239,15 +239,15 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.receipt{
.receipt {
  height: 100%;
  overflow: hidden;
  .filter{
  .filter {
    height: 80px;
    display: flex;
    align-items: center;
    padding: 12px 20px 0 20px;
    &-card{
    &-card {
      height: 80px;
      display: flex;
      align-items: center;
@@ -258,7 +258,7 @@
      background-color: #fff;
    }
  }
  .body{
  .body {
    box-sizing: border-box;
    padding: 10px 20px;
    border-radius: 12px;
src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -13,7 +13,7 @@
        :model="editConfig.infomation"
        :rules="rules"
        label-position="right"
        label-width="308px"
        label-width="168px"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
@@ -25,12 +25,12 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="主题" prop="subject">
                  <el-input v-model="editConfig.infomation.subject"></el-input>
                  <el-input v-model="editConfig.infomation.subject" style="width: 100%"></el-input>
                </el-form-item>
              </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">
@@ -45,6 +45,7 @@
                      "
                      value-key="name"
                      @select="handleSelectClient('client', $event)"
                      style="width: 100%"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick('client')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
@@ -67,6 +68,7 @@
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                      style="width: 100%"
                    >
                      <el-option v-for="item in invoiceTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
@@ -83,6 +85,7 @@
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                      style="width: 100%"
                    >
                      <el-option
                        v-for="item in invoiceStatusOptions"
@@ -102,7 +105,7 @@
                    v-model="editConfig.infomation.principalId"
                    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>
@@ -121,6 +124,7 @@
                      "
                      value-key="number"
                      @select="handleSelectClient('serviceContract', $event)"
                      style="width: 100%"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick('serviceContract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
@@ -150,6 +154,7 @@
                      "
                      value-key="number"
                      @select="handleSelectClient('contract', $event)"
                      style="width: 100%"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick('contract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
@@ -166,7 +171,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="纳税识别号" prop="taxpayerIdNumber">
                  <el-input v-model="editConfig.infomation.taxpayerIdNumber"></el-input>
                  <el-input v-model="editConfig.infomation.taxpayerIdNumber" style="width: 100%"></el-input>
                </el-form-item>
              </el-col>
            </el-row>
@@ -183,6 +188,7 @@
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                      style="width: 100%"
                    >
                      <el-option
                        v-for="item in courierCompanyOptions"
@@ -198,7 +204,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="物流单号" prop="courierNumber">
                  <el-input v-model="editConfig.infomation.courierNumber"></el-input>
                  <el-input v-model="editConfig.infomation.courierNumber" style="width: 100%"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -208,13 +214,14 @@
                    value-format="yyyy-MM-dd"
                    type="date"
                    placeholder="选择日期"
                    style="width: 100%"
                  >
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="发票号码" prop="invoiceNumber">
                  <el-input v-model="editConfig.infomation.invoiceNumber"></el-input>
                  <el-input v-model="editConfig.infomation.invoiceNumber" style="width: 100%"></el-input>
                </el-form-item>
              </el-col>
            </el-row>
@@ -384,7 +391,7 @@
  },
  data() {
    return {
      dialogWidth: "80%",
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        subject: [{ required: true, message: "请输入主题", trigger: "blur" }],
src/views/other/payment/saleInvoice/index.vue
@@ -206,7 +206,7 @@
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.sourceType = this.sourceType
      this.editConfig.infomation = { ...this.addConfig }
      this.editConfig.infomation = { ...this.addConfig, number: "" }
    }
  }
}